diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 74cd344..69f2f02 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,7 +49,8 @@
         </activity>
         <activity
             android:name=".LoginActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name"
+            android:parentActivityName="org.deke.risk.riskahead.StartActivity" >>
         </activity>
         <activity android:name="com.twitter.sdk.android.core.identity.OAuthActivity" />
         <activity
@@ -60,11 +61,13 @@
         </activity>
         <activity
             android:name=".MainActivity"
-            android:label="@string/title_activity_entrance" >
+            android:label="@string/title_activity_entrance"
+            android:parentActivityName="org.deke.risk.riskahead.LoginActivity">
         </activity>
         <activity
             android:name=".MapsActivity"
-            android:label="@string/title_activity_maps" >
+            android:label="@string/title_activity_maps"
+            android:parentActivityName="org.deke.risk.riskahead.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -82,7 +85,8 @@
             android:exported="false" />
         <activity
             android:name=".UserConfigActivity"
-            android:label="@string/title_activity_user_config" >
+            android:label="@string/title_activity_user_config"
+            android:parentActivityName="org.deke.risk.riskahead.MainActivity">
         </activity>
     </application>
 
diff --git a/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java b/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java
index b1ca1e8..07ecf83 100644
--- a/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java
+++ b/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java
@@ -6,6 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
+import android.provider.SyncStateContract;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
@@ -25,8 +26,8 @@ import org.deke.risk.riskahead.helper.PlaceProvider;
 
 public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCallbacks<Cursor> {
     private static GoogleMap mMap;
-    private static Double latitude, longitude;
     private String mActivityTitle = "RiskMap";
+    private LatLng myLocation;
 
     private void handleIntent(Intent intent){
         if(Intent.ACTION_SEARCH.equals(intent.getAction()))
@@ -74,6 +75,11 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
             CameraUpdate cameraPosition = CameraUpdateFactory.newLatLng(position);
             mMap.animateCamera(cameraPosition);
         }
+
+        if (position != null) {
+            myLocation = new LatLng(position.latitude,position.longitude);
+        }
+        mMap.animateCamera(CameraUpdateFactory.newLatLngZoom(myLocation,  20));
     }
 
     @Override
@@ -103,22 +109,13 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
         //setContentView(R.layout.activity_maps);
 
         // Passing harcoded values for latitude & longitude. Please change as per your need. This is just used to drop a Marker on the Map
-        latitude = 53.33;
-        longitude = 10.02;
-
-        setUpMapIfNeeded(); // For setting up the MapFragment
-
-        if (mMap != null)
-            setUpMap();
-
-        if (mMap == null) {
-            // Try to obtain the map from the SupportMapFragment.
-            mMap = ((SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.map)).getMap(); // getMap is deprecated
-            // Check if we were successful in obtaining the map.
-            if (mMap != null)
-                setUpMap();
-        }
+        //latitude = 53.33;
+       // longitude = 10.02;
 
+       // setUpMapIfNeeded(); // For setting up the MapFragment
+        mMap = ((SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.map)).getMap();
+        mMap.setMyLocationEnabled(true);
+        mMap.getUiSettings().setZoomControlsEnabled(true);
         handleIntent(getIntent());
     }
 
@@ -156,14 +153,14 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
      * This should only be called once and when we are sure that {@link #mMap}
      * is not null.
      */
-    private static void setUpMap() {
+    private void setUpMap() {
         // For showing a move to my loction button
         mMap.setMyLocationEnabled(true);
         mMap.getUiSettings().setZoomControlsEnabled(true);
         // For dropping a marker at a point on the Map
-        mMap.addMarker(new MarkerOptions().position(new LatLng(latitude, longitude)).title("My Home").snippet("Home Address"));
+        mMap.addMarker(new MarkerOptions().position(myLocation).title("My Home").snippet("Home Address"));
         // For zooming automatically to the Dropped PIN Location
-        mMap.animateCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(latitude, longitude), 12.0f));
+        mMap.animateCamera(CameraUpdateFactory.newLatLngZoom(myLocation, 12.0f));
     }
 
     /**** The mapfragment's id must be removed from the FragmentManager
diff --git a/app/src/main/java/org/deke/risk/riskahead/helper/AppConfig.java b/app/src/main/java/org/deke/risk/riskahead/helper/AppConfig.java
index f34161c..abc3d4a 100644
--- a/app/src/main/java/org/deke/risk/riskahead/helper/AppConfig.java
+++ b/app/src/main/java/org/deke/risk/riskahead/helper/AppConfig.java
@@ -5,8 +5,8 @@ package org.deke.risk.riskahead.helper;
  */
 public class AppConfig {
     // Server user login url
-    public static String URL_LOGIN = "http://192.168.178.31/riskahead/rest/";
+    public static String URL_LOGIN = "http://www.riskahead.de/helper/rest/";
 
     // Server user register url
-    public static String URL_REGISTER = "http://192.168.178.31/riskahead/rest/";
+    public static String URL_REGISTER = "http://www.riskahead.de/helper/rest/";
 }
diff --git a/app/src/main/res/menu/menu_maps.xml b/app/src/main/res/menu/menu_maps.xml
index bb64cde..a191ff3 100644
--- a/app/src/main/res/menu/menu_maps.xml
+++ b/app/src/main/res/menu/menu_maps.xml
@@ -3,8 +3,12 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="org.deke.risk.riskahead.MapsActivity">
 
+    <item android:id="@+id/action_refresh" android:title="@string/action_refresh"
+        android:orderInCategory="100" app:showAsAction="never" />
     <item android:id="@+id/action_settings" android:title="@string/action_settings"
         android:orderInCategory="100" app:showAsAction="never" />
+    <item android:id="@+id/action_contact" android:title="@string/action_help"
+        android:orderInCategory="100" app:showAsAction="never" />
 
     <item android:id="@+id/location_search"
         android:title="Search"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a1ad36f..0f17645 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,14 +31,16 @@
     <string name="settings_logout">Logout</string>
     <string name="find">Find</string>
     <string name="hint">Enter Place</string>
-    <string name="action_search">search</string>
-    <string name="app_label">Label</string>
-    <string name="search_hint">Hint</string>
 
-    <string name="title_activity_maps">RiskMap</string>
+    <string name="action_search">Search</string>
+    <string name="action_refresh">Refresh page</string>
+    <string name="action_help">Help &amp; Feedback</string>
 
-    <string name="hello_world">Hello world!</string>
     <string name="title_activity_base">Base</string>
     <string name="title_activity_user_config">User Profile</string>
+    <string name="title_activity_maps">RiskMap</string>
+
+    <string name="app_label">Label</string>
+    <string name="search_hint">Location</string>
     <string name="search_settings">search settings</string>
 </resources>