diff --git a/app/app.iml b/app/app.iml
index cc74691..ef9b609 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -85,8 +85,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="guava-15.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-6.5.87" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-21.0.2" level="project" />
     <orderEntry type="library" exported="" name="dagger-1.2.2" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="library-1.3" level="project" />
     <orderEntry type="library" exported="" name="eventbus-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="httpclientandroidlib-1.1.2" level="project" />
@@ -96,11 +96,11 @@
     <orderEntry type="library" exported="" name="dagger-compiler-1.2.2" level="project" />
     <orderEntry type="library" exported="" name="library-1.0.8" level="project" />
     <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-21.0.2" level="project" />
     <orderEntry type="library" exported="" name="YouTubeAndroidPlayerApi" level="project" />
     <orderEntry type="library" exported="" name="javax.inject-1" level="project" />
     <orderEntry type="library" exported="" name="achartengine-1.1.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-21.0.2" level="project" />
     <orderEntry type="library" exported="" name="bolts-android-1.1.2" level="project" />
     <orderEntry type="library" exported="" name="javawriter-2.5.0" level="project" />
   </component>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9b8949c..53833d7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
         </meta-data>
         <meta-data
             android:name="com.google.android.maps.v2.API_KEY"
-            android:value="AIzaSyBvatkHkBtQ8lk6xtRnd4ZXTX8CgxfsZQQ" >
+            android:value="AIzaSyBpDIEEPbFGUr7cvXI5_nq04J6i5fou9rY" >
         </meta-data>
 
         <activity
diff --git a/app/src/main/java/com/eswaraj/app/eswaraj/activities/SplashActivity.java b/app/src/main/java/com/eswaraj/app/eswaraj/activities/SplashActivity.java
index b8d8732..2646d37 100644
--- a/app/src/main/java/com/eswaraj/app/eswaraj/activities/SplashActivity.java
+++ b/app/src/main/java/com/eswaraj/app/eswaraj/activities/SplashActivity.java
@@ -10,9 +10,11 @@
 import com.eswaraj.app.eswaraj.events.GetCategoriesDataEvent;
 import com.eswaraj.app.eswaraj.events.GetCategoriesImagesEvent;
 import com.eswaraj.app.eswaraj.events.GetUserEvent;
+import com.eswaraj.app.eswaraj.events.LoginResultEvent;
 import com.eswaraj.app.eswaraj.fragments.SplashFragment;
 import com.eswaraj.app.eswaraj.interfaces.FacebookLoginInterface;
 import com.eswaraj.app.eswaraj.interfaces.LaunchNextActivityInterface;
+import com.eswaraj.app.eswaraj.models.UserSession;
 import com.eswaraj.app.eswaraj.util.LocationUtil;
 import com.eswaraj.app.eswaraj.middleware.MiddlewareServiceImpl;
 import com.eswaraj.app.eswaraj.util.InternetServicesCheckUtil;
@@ -25,7 +27,7 @@
 
 import de.greenrobot.event.EventBus;
 
-public class SplashActivity extends BaseActivity implements FacebookLoginInterface, LaunchNextActivityInterface {
+public class SplashActivity extends BaseActivity implements LaunchNextActivityInterface {
 
     private SplashFragment splashFragment;
     @Inject
@@ -40,33 +42,21 @@ public class SplashActivity extends BaseActivity implements FacebookLoginInterfa
     EventBus eventBus;
 
     //Logged-in user
-    UserDto userDto;
+    @Inject
+    UserSession userSession;
 
     //Internet and Location service availability
     Boolean hasNeededServices;
 
     //Maintain async task return state
-    Boolean loginDone;
     Boolean serverDataDownloadDone;
     Boolean redirectDone;
-    Boolean userLocationKnown;
-
-    //Facebook Session
-    Session session;
 
 
     @Override
     protected void onStart() {
         super.onStart();
-        eventBus.registerSticky(this);
 
-        //Start location service
-        locationUtil.startLocationService();
-        //Start data download from server, if needed
-        middlewareService.loadCategoriesData(this, true);
-        //Check if Internet connection and Location services are present. If not, don't proceed.
-        hasNeededServices = checkLocationAndInternet();
-        splashFragment.notifyServiceAvailability(hasNeededServices);
     }
 
     @Override
@@ -81,26 +71,24 @@ protected void onStop() {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_splash);
+        eventBus.register(this);
 
-        splashFragment = SplashFragment.newInstance("", "");
-        if (savedInstanceState == null) {
-            getSupportFragmentManager().beginTransaction().add(R.id.SplashFragmentContainer, splashFragment).commit();
-        }
+        splashFragment = (SplashFragment)getSupportFragmentManager().findFragmentById(R.id.splash_fragment);
 
         locationUtil.setup(this);
 
         //Set up initial state
-        loginDone = false;
         serverDataDownloadDone = false;
         redirectDone = false;
-        userLocationKnown = false;
 
-    }
+        //Start location service
+        locationUtil.startLocationService();
+        //Start data download from server, if needed
+        middlewareService.loadCategoriesData(this, true);
+        //Check if Internet connection and Location services are present. If not, don't proceed.
+        hasNeededServices = checkLocationAndInternet();
+        splashFragment.notifyServiceAvailability(hasNeededServices);
 
-    @Override
-    public void onFacebookLoginDone(Session session) {
-        this.session = session;
-        middlewareService.loadUserData(this, session);
     }
 
     @Override
@@ -135,32 +123,18 @@ public void onEventMainThread(GetCategoriesDataEvent event) {
         }
     }
 
-    public void onEventMainThread(GetUserEvent event) {
-        if(event.getSuccess()) {
-            Log.d("SplashActivity", "GetUserEvent:Success");
-            userDto = event.getUserDto();
-            loginDone = true;
-            if(userDto.getPerson().getPersonAddress() != null) {
-                if(userDto.getPerson().getPersonAddress().getLongitude() != null) {
-                    userLocationKnown = true;
-                }
-            }
-            if(serverDataDownloadDone) {
-                appReady();
-            }
-        }
-        else {
-            Toast.makeText(this, "Could not fetch user details from server. Error = " + event.getError(), Toast.LENGTH_LONG).show();
-            //Show retry button which will re-trigger the request.
-        }
-    }
 
 
+
+    //Event When Login is Completed either fail or Success
+    public void onEventMainThread(LoginResultEvent event) {
+        takeUserToNextScreen();
+    }
     public void onEventMainThread(GetCategoriesImagesEvent event) {
         if(event.getSuccess()) {
             Log.d("SplashActivity", "GetCategoriesImagesEvent:Success");
             serverDataDownloadDone = true;
-            if (loginDone) {
+            if (splashFragment.getLoginDone()) {
                 appReady();
             }
         }
@@ -168,14 +142,14 @@ public void onEventMainThread(GetCategoriesImagesEvent event) {
             Toast.makeText(this, "Could not fetch all categories images from server. Error = " + event.getError(), Toast.LENGTH_LONG).show();
             //Show retry button which will re-trigger the request.
             serverDataDownloadDone = true;
-            if (loginDone) {
+            if (splashFragment.getLoginDone()) {
                 appReady();
             }
         }
     }
 
     private void appReady() {
-        splashFragment.setShowInstruction(!userLocationKnown);
+        splashFragment.setShowInstruction(!userSession.isUserLocationKnown());
         splashFragment.notifyAppReady();
     }
 
@@ -190,7 +164,7 @@ public void takeUserToNextScreen() {
             } else {
                 redirectDone = true;
                 Intent i = null;
-                if(userLocationKnown) {
+                if(userSession.isUserLocationKnown()) {
                     i = new Intent(this, SelectAmenityActivity.class);
                 }
                 else {
@@ -198,7 +172,6 @@ public void takeUserToNextScreen() {
                 }
                 startActivity(i);
                 locationUtil.stopLocationService();
-                eventBus.unregister(this);
                 finish(); //User cant press back to return to this activity
             }
         }
diff --git a/app/src/main/java/com/eswaraj/app/eswaraj/events/LoginResultEvent.java b/app/src/main/java/com/eswaraj/app/eswaraj/events/LoginResultEvent.java
new file mode 100644
index 0000000..dd0a4c7
--- /dev/null
+++ b/app/src/main/java/com/eswaraj/app/eswaraj/events/LoginResultEvent.java
@@ -0,0 +1,9 @@
+package com.eswaraj.app.eswaraj.events;
+
+/**
+ * Created by Ravi on 24/12/2014.
+ */
+public class LoginResultEvent {
+    private boolean success;
+
+}
diff --git a/app/src/main/java/com/eswaraj/app/eswaraj/fragments/SplashFragment.java b/app/src/main/java/com/eswaraj/app/eswaraj/fragments/SplashFragment.java
index e8c41dd..5c55689 100644
--- a/app/src/main/java/com/eswaraj/app/eswaraj/fragments/SplashFragment.java
+++ b/app/src/main/java/com/eswaraj/app/eswaraj/fragments/SplashFragment.java
@@ -3,23 +3,32 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.eswaraj.app.eswaraj.R;
 import com.eswaraj.app.eswaraj.base.BaseFragment;
+import com.eswaraj.app.eswaraj.events.GetUserEvent;
+import com.eswaraj.app.eswaraj.events.LoginResultEvent;
 import com.eswaraj.app.eswaraj.interfaces.FacebookLoginInterface;
 import com.eswaraj.app.eswaraj.interfaces.LaunchNextActivityInterface;
+import com.eswaraj.app.eswaraj.middleware.MiddlewareServiceImpl;
+import com.eswaraj.app.eswaraj.models.UserSession;
 import com.eswaraj.app.eswaraj.util.FacebookLoginUtil;
+import com.eswaraj.web.dto.UserDto;
 import com.facebook.Session;
 import com.facebook.widget.LoginButton;
 import com.pnikosis.materialishprogress.ProgressWheel;
 
 import javax.inject.Inject;
 
+import de.greenrobot.event.EventBus;
+
 
 public class SplashFragment extends BaseFragment implements FacebookLoginInterface {
 
@@ -30,17 +39,24 @@ public class SplashFragment extends BaseFragment implements FacebookLoginInterfa
     TextView welcomeText;
     ProgressWheel progressWheel;
 
+    boolean loginDone = false;
+
+    //Facebook Session
+    Session session;
+
     @Inject
-    FacebookLoginUtil facebookLoginUtil;
+    UserSession userSession;
 
-    private Boolean showInstruction;
+    @Inject
+    EventBus eventBus;
 
-    public static SplashFragment newInstance(String param1, String param2) {
-        SplashFragment fragment = new SplashFragment();
-        Bundle args = new Bundle();
-        fragment.setArguments(args);
-        return fragment;
-    }
+    @Inject
+    MiddlewareServiceImpl middlewareService;
+
+    @Inject
+    FacebookLoginUtil facebookLoginUtil;
+
+    private boolean showInstruction = false;
 
     public SplashFragment() {
         // Required empty public constructor
@@ -50,6 +66,7 @@ public SplashFragment() {
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
+
         //References to UI elements
         buttonLogin = (LoginButton) getView().findViewById(R.id.buttonLogin);
         buttonQuit = (Button) getView().findViewById(R.id.buttonQuit);
@@ -94,7 +111,7 @@ public void notifyServiceAvailability(Boolean hasNeededServices) {
         }
     }
 
-    public void setShowInstruction(Boolean show) {
+    public void setShowInstruction(boolean show) {
         showInstruction = show;
     }
 
@@ -107,21 +124,20 @@ public void notifyAppReady() {
             welcomeText.setText("The app is setup.\n\nOn the next screen you will be asked to mark your home location on a map.\n\nThis is a one-time activity and will help us serve you data about your constituency.");
             buttonGotIt.setVisibility(View.VISIBLE);
         }
-        else {
-            ((LaunchNextActivityInterface) getActivity()).takeUserToNextScreen();
-        }
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         facebookLoginUtil.onCreate(this, savedInstanceState);
+        eventBus.register(this);
     }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
         facebookLoginUtil.onDestroy();
+        eventBus.unregister(this);
     }
 
     @Override
@@ -155,7 +171,8 @@ public void onFacebookLoginDone(Session session) {
         buttonLogin.setVisibility(View.INVISIBLE);
         progressWheel.setVisibility(View.VISIBLE);
         progressWheel.spin();
-        ((FacebookLoginInterface)getActivity()).onFacebookLoginDone(session);
+        this.session = session;
+        middlewareService.loadUserData(this.getActivity(), session);
     }
 
 
@@ -164,4 +181,29 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         facebookLoginUtil.onActivityResult(requestCode, resultCode, data);
     }
+
+    public boolean getLoginDone() {
+        return loginDone;
+    }
+
+    public void setLoginDone(boolean loginDone) {
+        this.loginDone = loginDone;
+    }
+
+    public void onEventMainThread(GetUserEvent event) {
+        if(event.getSuccess()) {
+            Log.d("SplashActivity", "GetUserEvent:Success");
+            UserDto userDto = event.getUserDto();
+            userSession.setUser(userDto);
+            notifyAppReady();
+        }
+        else {
+            Toast.makeText(this.getActivity(), "Could not fetch user details from server. Error = " + event.getError(), Toast.LENGTH_LONG).show();
+            //Show retry button which will re-trigger the request.
+        }
+        LoginResultEvent loginResultEvent = new LoginResultEvent();
+        eventBus.post(loginResultEvent);
+    }
+
+
 }
diff --git a/app/src/main/java/com/eswaraj/app/eswaraj/helpers/ReverseGeocodingTask.java b/app/src/main/java/com/eswaraj/app/eswaraj/helpers/ReverseGeocodingTask.java
index d5a6a36..fa2a5b1 100644
--- a/app/src/main/java/com/eswaraj/app/eswaraj/helpers/ReverseGeocodingTask.java
+++ b/app/src/main/java/com/eswaraj/app/eswaraj/helpers/ReverseGeocodingTask.java
@@ -1,5 +1,6 @@
 package com.eswaraj.app.eswaraj.helpers;
 
+import android.app.Activity;
 import android.content.Context;
 import android.location.Address;
 import android.location.Geocoder;
diff --git a/app/src/main/java/com/eswaraj/app/eswaraj/models/UserSession.java b/app/src/main/java/com/eswaraj/app/eswaraj/models/UserSession.java
new file mode 100644
index 0000000..62ca45a
--- /dev/null
+++ b/app/src/main/java/com/eswaraj/app/eswaraj/models/UserSession.java
@@ -0,0 +1,27 @@
+package com.eswaraj.app.eswaraj.models;
+
+import com.eswaraj.web.dto.UserDto;
+
+/**
+ * Created by Ravi on 24/12/2014.
+ */
+public class UserSession {
+    private UserDto user;
+
+    public boolean isUserLocationKnown(){
+        if(user.getPerson().getPersonAddress() != null) {
+            if(user.getPerson().getPersonAddress().getLongitude() != null) {
+                return true;
+            }
+        }
+        return false;
+    }
+    public UserDto getUser() {
+        return user;
+    }
+
+    public void setUser(UserDto user) {
+        this.user = user;
+    }
+
+}
diff --git a/app/src/main/java/com/eswaraj/app/eswaraj/modules/MiddlewareGraph.java b/app/src/main/java/com/eswaraj/app/eswaraj/modules/MiddlewareGraph.java
index 6296b42..f0c9097 100644
--- a/app/src/main/java/com/eswaraj/app/eswaraj/modules/MiddlewareGraph.java
+++ b/app/src/main/java/com/eswaraj/app/eswaraj/modules/MiddlewareGraph.java
@@ -31,6 +31,7 @@
 import com.eswaraj.app.eswaraj.helpers.NetworkAccessHelper;
 import com.eswaraj.app.eswaraj.helpers.ReverseGeocodingTask;
 import com.eswaraj.app.eswaraj.helpers.SharedPreferencesHelper;
+import com.eswaraj.app.eswaraj.models.UserSession;
 import com.eswaraj.app.eswaraj.util.DeviceUtil;
 import com.eswaraj.app.eswaraj.util.GooglePlacesUtil;
 import com.eswaraj.app.eswaraj.util.LocationUtil;
@@ -209,4 +210,10 @@ CommentsRequest provideCommentsRequest() {
     CommentPostRequest provideCommentPostRequest() {
         return new CommentPostRequest();
     }
+
+    @Provides @Singleton
+    UserSession userSession() {
+        return new UserSession();
+    }
+
 }
diff --git a/app/src/main/java/com/eswaraj/app/eswaraj/util/LocationUtil.java b/app/src/main/java/com/eswaraj/app/eswaraj/util/LocationUtil.java
index bbe13d9..6048e4a 100644
--- a/app/src/main/java/com/eswaraj/app/eswaraj/util/LocationUtil.java
+++ b/app/src/main/java/com/eswaraj/app/eswaraj/util/LocationUtil.java
@@ -12,6 +12,8 @@
 import com.google.android.gms.location.LocationRequest;
 import com.google.android.gms.location.LocationServices;
 
+import java.util.Date;
+
 import javax.inject.Inject;
 
 import de.greenrobot.event.EventBus;
@@ -21,6 +23,10 @@ public class LocationUtil extends BaseClass implements GoogleApiClient.Connectio
     private LocationRequest locationRequest;
     private GoogleApiClient googleApiClient;
 
+    private Location lastKnownLocation;
+    private Long lastLocationServiceStartTime = 0L;
+    private Long lastLocationServiceStopTime = 0L;
+
     @Inject
     EventBus eventBus;
 
@@ -45,10 +51,14 @@ public void setup(Context context) {
     }
 
     public void startLocationService() {
-        googleApiClient.connect();
+        lastLocationServiceStartTime = System.currentTimeMillis();
+        if (!googleApiClient.isConnected()) {
+            googleApiClient.connect();
+        }
     }
 
     public void stopLocationService() {
+        lastLocationServiceStopTime = System.currentTimeMillis();
         if (googleApiClient.isConnected()) {
             LocationServices.FusedLocationApi.removeLocationUpdates(googleApiClient, this);
         }
@@ -69,10 +79,44 @@ public void onConnectionSuspended(int i) {
     @Override
     public void onLocationChanged(Location location) {
         this.eventBus.postSticky(location);
+        stopLocationListenerIfNeeded();
     }
 
     @Override
     public void onConnectionFailed(ConnectionResult connectionResult) {
         Log.d("LocationService", "Connection Failed");
     }
+    public Location getLastKnownLocation() {
+        startLocationListenerIfNeeded();
+        return lastKnownLocation;
+    }
+
+    public void setLastKnownLocation(Location lastKnownLocation) {
+        this.lastKnownLocation = lastKnownLocation;
+    }
+
+    /**
+     * Automatically Start Location Services if needed
+     */
+    private void startLocationListenerIfNeeded(){
+        if(lastKnownLocation == null && googleApiClient.isConnected()){
+            //if we dont have last Known Location and we are not connected yet
+            startLocationService();
+        }
+        if(System.currentTimeMillis() - lastLocationServiceStopTime > 60000){
+            //If location is not tracked since last one minute Start updates again
+            startLocationService();
+        }
+    }
+
+    /**
+     * Automatically Stop Location Services if needed
+     */
+    private void stopLocationListenerIfNeeded(){
+        if(lastKnownLocation != null && googleApiClient.isConnected() && (System.currentTimeMillis() - lastLocationServiceStartTime) > 60000){
+            //if we dont have last Known Location and we are not connected yet
+            stopLocationService();
+        }
+    }
+
 }
diff --git a/app/src/main/java/com/eswaraj/app/eswaraj/volley/LoadCategoriesImagesRequest.java b/app/src/main/java/com/eswaraj/app/eswaraj/volley/LoadCategoriesImagesRequest.java
index 5af3d8c..41a72d4 100644
--- a/app/src/main/java/com/eswaraj/app/eswaraj/volley/LoadCategoriesImagesRequest.java
+++ b/app/src/main/java/com/eswaraj/app/eswaraj/volley/LoadCategoriesImagesRequest.java
@@ -46,32 +46,21 @@ public LoadCategoriesImagesRequest () {
     }
 
     public void processRequest(Context context, List<CategoryWithChildCategoryDto> categoriesList) {
-        imageReqCount = categoriesList.size()*2;
+        imageReqCount = categoriesList.size() * 2;//Double as each Category have one icon image and one header image
         Boolean icon = null;
         for(CategoryWithChildCategoryDto categoryDto : categoriesList) {
-            String url = categoryDto.getImageUrl();
-            icon = true;
-            if(url != "") {
-                Log.d("LoadCategoriesImages", url);
-                Long id = categoryDto.getId();
-                ImageRequest request = new ImageRequest(url, createSuccessListener(context, id, icon), 0, 0, null, createErrorListener(context));
-                this.networkAccessHelper.submitNetworkRequest("GetImage" + id, request);
-            }
-            else {
-                imageResCount.incrementAndGet();
-            }
-
-            url = categoryDto.getHeaderImageUrl();
-            icon = false;
-            if(url != "") {
-                Log.d("LoadCategoriesImages", url);
-                Long id = categoryDto.getId();
-                ImageRequest request = new ImageRequest(url, createSuccessListener(context, id, icon), 0, 0, null, createErrorListener(context));
-                this.networkAccessHelper.submitNetworkRequest("GetHeaderImage" + id, request);
-            }
-            else {
-                imageResCount.incrementAndGet();
-            }
+            downloadImage(context, categoryDto.getId(),categoryDto.getImageUrl(), true);
+            downloadImage(context, categoryDto.getId(),categoryDto.getHeaderImageUrl(), false);
+        }
+    }
+    private void downloadImage(Context context,Long id, String url, boolean icon){
+        if(url != null && !"".equals(url.trim())) {
+            Log.d("LoadCategoriesImages", url);
+            ImageRequest request = new ImageRequest(url, createSuccessListener(context, id, icon), 0, 0, null, createErrorListener(context));
+            this.networkAccessHelper.submitNetworkRequest("GetHeaderImage" + id, request);
+        }
+        else {
+            imageResCount.incrementAndGet();
         }
     }
 
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index 83d7fe1..2a66b91 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -12,6 +12,10 @@
         android:id="@+id/SplashFragmentContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
+        <fragment class="com.eswaraj.app.eswaraj.fragments.SplashFragment"
+            android:id="@+id/splash_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
     </FrameLayout>
 
 </RelativeLayout>