diff --git a/mobility-track-android/.idea/.name b/mobility-track-android/.idea/.name
deleted file mode 100644
index 75ff080..0000000
--- a/mobility-track-android/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-mobility-track-android
\ No newline at end of file
diff --git a/mobility-track-android/.idea/gradle.xml b/mobility-track-android/.idea/gradle.xml
index 0ef7b3e..0e23f8e 100644
--- a/mobility-track-android/.idea/gradle.xml
+++ b/mobility-track-android/.idea/gradle.xml
@@ -3,10 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.8" />
-        <option name="gradleJvm" value="1.8" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/mobility-track-android/.idea/vcs.xml b/mobility-track-android/.idea/vcs.xml
deleted file mode 100644
index 6c0b863..0000000
--- a/mobility-track-android/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/mobility-track-android/app/app.iml b/mobility-track-android/app/app.iml
index 0a7e21a..2ca0932 100644
--- a/mobility-track-android/app/app.iml
+++ b/mobility-track-android/app/app.iml
@@ -66,14 +66,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -82,8 +74,17 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
@@ -95,11 +96,18 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-maps/10.0.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-tasks/10.0.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
@@ -107,7 +115,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 23 Platform (1)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="play-services-basement-10.0.1" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
diff --git a/mobility-track-android/app/src/main/AndroidManifest.xml b/mobility-track-android/app/src/main/AndroidManifest.xml
index febe064..557d681 100644
--- a/mobility-track-android/app/src/main/AndroidManifest.xml
+++ b/mobility-track-android/app/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
         <service android:name=".LocationUpdates" />
 
         <activity
-            android:name=".MainActivity"
+            android:name=".Splash"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -29,6 +29,14 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+       
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar">
+        </activity>
+
+
         <activity
             android:name=".SettingsActivity"
             android:label="@string/title_activity_settings"
diff --git a/mobility-track-android/app/src/main/java/ogr/scorelab/ucsc/mobility_track/Splash.java b/mobility-track-android/app/src/main/java/ogr/scorelab/ucsc/mobility_track/Splash.java
new file mode 100644
index 0000000..3520ba1
--- /dev/null
+++ b/mobility-track-android/app/src/main/java/ogr/scorelab/ucsc/mobility_track/Splash.java
@@ -0,0 +1,45 @@
+package ogr.scorelab.ucsc.mobility_track;
+
+/**
+ * Created by reubenvarghese1 on 14/12/16.
+ */
+
+        import android.app.Activity;
+        import android.content.Intent;
+        import android.os.Bundle;
+        import android.os.Handler;
+
+public class Splash extends Activity {
+
+    // Splash screen timer
+    private static int SPLASH_TIME_OUT = 3000;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_splash);
+
+        new Handler().postDelayed(new Runnable() {
+
+            /*
+             * Showing splash screen with a timer. This will be useful when you
+             * want to show case your app logo / company
+             */
+
+            @Override
+            public void run() {
+                // This method will be executed once the timer is over
+                // Start your app main activity
+                Intent i = new Intent(Splash.this, MainActivity.class);
+                startActivity(i);
+
+                // close this activity
+                finish();
+            }
+        }, SPLASH_TIME_OUT);
+    }
+
+}
+
+
+
diff --git a/mobility-track-android/app/src/main/res/drawable-hdpi/b.gif b/mobility-track-android/app/src/main/res/drawable-hdpi/b.gif
new file mode 100644
index 0000000..99ad03b
Binary files /dev/null and b/mobility-track-android/app/src/main/res/drawable-hdpi/b.gif differ
diff --git a/mobility-track-android/app/src/main/res/drawable-hdpi/score.jpg b/mobility-track-android/app/src/main/res/drawable-hdpi/score.jpg
new file mode 100644
index 0000000..579ef29
Binary files /dev/null and b/mobility-track-android/app/src/main/res/drawable-hdpi/score.jpg differ
diff --git a/mobility-track-android/app/src/main/res/drawable-mdpi/b.gif b/mobility-track-android/app/src/main/res/drawable-mdpi/b.gif
new file mode 100644
index 0000000..99ad03b
Binary files /dev/null and b/mobility-track-android/app/src/main/res/drawable-mdpi/b.gif differ
diff --git a/mobility-track-android/app/src/main/res/drawable-mdpi/score.jpg b/mobility-track-android/app/src/main/res/drawable-mdpi/score.jpg
new file mode 100644
index 0000000..579ef29
Binary files /dev/null and b/mobility-track-android/app/src/main/res/drawable-mdpi/score.jpg differ
diff --git a/mobility-track-android/app/src/main/res/drawable-xhdpi/b.gif b/mobility-track-android/app/src/main/res/drawable-xhdpi/b.gif
new file mode 100644
index 0000000..99ad03b
Binary files /dev/null and b/mobility-track-android/app/src/main/res/drawable-xhdpi/b.gif differ
diff --git a/mobility-track-android/app/src/main/res/drawable-xhdpi/score.jpg b/mobility-track-android/app/src/main/res/drawable-xhdpi/score.jpg
new file mode 100644
index 0000000..579ef29
Binary files /dev/null and b/mobility-track-android/app/src/main/res/drawable-xhdpi/score.jpg differ
diff --git a/mobility-track-android/app/src/main/res/drawable-xxhdpi/b.gif b/mobility-track-android/app/src/main/res/drawable-xxhdpi/b.gif
new file mode 100644
index 0000000..99ad03b
Binary files /dev/null and b/mobility-track-android/app/src/main/res/drawable-xxhdpi/b.gif differ
diff --git a/mobility-track-android/app/src/main/res/drawable-xxhdpi/score.jpg b/mobility-track-android/app/src/main/res/drawable-xxhdpi/score.jpg
new file mode 100644
index 0000000..579ef29
Binary files /dev/null and b/mobility-track-android/app/src/main/res/drawable-xxhdpi/score.jpg differ
diff --git a/mobility-track-android/app/src/main/res/layout/activity_splash.xml b/mobility-track-android/app/src/main/res/layout/activity_splash.xml
new file mode 100644
index 0000000..6f9c2b0
--- /dev/null
+++ b/mobility-track-android/app/src/main/res/layout/activity_splash.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/colorPrimary"
+    android:weightSum="1">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="107dp"
+        android:gravity="center"
+        android:src="@drawable/score"
+        android:paddingTop="20dp"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="Mobility Track"
+        android:textColor="@color/colorWhite"
+        android:textSize="28dp"
+        android:layout_marginTop="100dp"
+        android:layout_weight="0.14" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="Powered by SCORE"
+        android:textColor="@color/colorWhite"
+        android:textSize="16dp"
+        android:layout_marginTop="20dp"
+        android:layout_weight="0.34" />
+    <ProgressBar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        android:gravity="center"
+        android:layout_weight="0.05" />
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/mobility-track-android/app/src/main/res/values/colors.xml b/mobility-track-android/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..82f15f1
--- /dev/null
+++ b/mobility-track-android/app/src/main/res/values/colors.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#212121</color>
+    <color name="colorPrimaryDark">#000000</color>
+    <color name="colorAccent">#AEEA00</color>
+    <color name="colorWhite">#FFFFFF</color>
+    <color name="textColorPrimary">#FFFFFF</color>
+    <color name="windowBackground">#FFFFFF</color>
+    <color name="navigationBarColor">#000000</color>
+</resources>
diff --git a/mobility-track-android/build.gradle b/mobility-track-android/build.gradle
index 573f4fd..f46d653 100644
--- a/mobility-track-android/build.gradle
+++ b/mobility-track-android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.1'
+        classpath 'com.android.tools.build:gradle:2.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files