diff --git a/sampleapp/ilapp2/src/main/java/com/ubudu/ilapp2/MainActivity.java b/sampleapp/ilapp2/src/main/java/com/ubudu/ilapp2/MainActivity.java
index f0ae39f..0e1432f 100644
--- a/sampleapp/ilapp2/src/main/java/com/ubudu/ilapp2/MainActivity.java
+++ b/sampleapp/ilapp2/src/main/java/com/ubudu/ilapp2/MainActivity.java
@@ -147,7 +147,7 @@ public void onTabSelected(@IdRes int tabItemId) {
         });
     }
 
-    private void initUbuduIndoorLocationSdk() {
+    public void initUbuduIndoorLocationSdk() {
         mIndoorLocationSdk = UbuduIndoorLocationSDK.getSharedInstance(getApplicationContext());
         mIndoorLocationManager = mIndoorLocationSdk.getIndoorLocationManager();
         mIndoorLocationManager.setBeaconScanningStrategy(new ScanningStrategy()
diff --git a/sampleapp/ilapp2/src/main/java/com/ubudu/ilapp2/fragment/MapFragment.java b/sampleapp/ilapp2/src/main/java/com/ubudu/ilapp2/fragment/MapFragment.java
index ef90bf5..48b5f2c 100644
--- a/sampleapp/ilapp2/src/main/java/com/ubudu/ilapp2/fragment/MapFragment.java
+++ b/sampleapp/ilapp2/src/main/java/com/ubudu/ilapp2/fragment/MapFragment.java
@@ -71,7 +71,6 @@ public class MapFragment extends BaseFragment implements UbuduIndoorLocationDele
     private final long TIME_OFFSET = 20L;
 
     private boolean showParticles = false;
-    private boolean showBeacons = false;
     private boolean showUndetectedBeacons = false;
     private static String lastLoadingLabelMessage = "";
     private boolean isMoving = false;
@@ -235,7 +234,6 @@ public void beaconsUpdated(List<ILBeacon> beacons) {
         if (isCameraMoving) {
             return;
         }
-        if (!showBeacons) return;
 
         // changing markers of beacons not present in the new list of beacons
         Map<Marker, com.google.android.gms.maps.model.Marker> markersMatchingTag = mMapView.findMarkers(new MarkerSearchPattern().tag(TAG_BEACON_MARKER));
@@ -509,12 +507,7 @@ public void onClick(View v) {
             showParticles = false;
         }
 
-        if (mSharedPref.getBoolean("show_beacons", false)) {
-            showBeacons = true;
-        } else {
-            hideAllDetectedBeaconMarkers();
-            showBeacons = false;
-        }
+
 
         UbuduMap map = UbuduIndoorLocationSDK.getSharedInstance(getContext()).getIndoorLocationManager().getMap();
         UbuduPositionUpdate lastUpdate = UbuduIndoorLocationSDK.getSharedInstance(getContext()).getIndoorLocationManager().getLastPositionUpdate();
diff --git a/sampleapp/ilapp2/src/main/java/com/ubudu/ilapp2/fragment/PreferencesFragment.java b/sampleapp/ilapp2/src/main/java/com/ubudu/ilapp2/fragment/PreferencesFragment.java
index 441db47..51d60d1 100644
--- a/sampleapp/ilapp2/src/main/java/com/ubudu/ilapp2/fragment/PreferencesFragment.java
+++ b/sampleapp/ilapp2/src/main/java/com/ubudu/ilapp2/fragment/PreferencesFragment.java
@@ -10,9 +10,12 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceFragmentCompatFix;
 import android.support.v7.preference.PreferenceGroup;
+import android.widget.Toast;
 
 import com.ubudu.ilapp2.MainActivity;
 import com.ubudu.ilapp2.R;
+import com.ubudu.ilapp2.util.FragmentUtils;
+import com.ubudu.ilapp2.util.MyPreferences;
 import com.ubudu.indoorlocation.UbuduIndoorLocationSDK;
 
 public class PreferencesFragment extends PreferenceFragmentCompatFix implements SharedPreferences.OnSharedPreferenceChangeListener {
@@ -42,6 +45,17 @@ public boolean onPreferenceClick(Preference preference) {
             }
         });
 
+        Preference myShowUndetectedBeacons = findPreference("undetected_beacons");
+        myShowUndetectedBeacons.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+
+                MyPreferences.setPreferenceBoolean(getContext(), "show_undetected_beacons", (Boolean) newValue);
+
+                return preference.isSelectable();
+            }
+        });
+
         Preference appVer = findPreference("app_version");
         try {
             appVer.setSummary(getContext().getPackageManager().getPackageInfo(getContext().getPackageName(), 0).versionName
@@ -52,6 +66,17 @@ public boolean onPreferenceClick(Preference preference) {
 
         Preference ilSdkVer = findPreference("indoorlocation_sdk_version");
         ilSdkVer.setSummary(UbuduIndoorLocationSDK.getVersion()+" ("+ UbuduIndoorLocationSDK.getVersionCode()+")");
+
+        Preference updateSettingsBtn = findPreference("update_settings");
+        updateSettingsBtn.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+            public boolean onPreferenceClick(Preference preference) {
+
+                ((MainActivity) getActivity()).initUbuduIndoorLocationSdk();
+                Toast.makeText(getContext(), "Data downloaded successfully ", Toast.LENGTH_SHORT).show();
+                FragmentUtils.changeFragment(getActivity() ,new MapFragment(),true);
+                return true;
+            }
+        });
     }
 
     @Override
diff --git a/sampleapp/ilapp2/src/main/res/values/strings.xml b/sampleapp/ilapp2/src/main/res/values/strings.xml
index b57d580..b1353aa 100644
--- a/sampleapp/ilapp2/src/main/res/values/strings.xml
+++ b/sampleapp/ilapp2/src/main/res/values/strings.xml
@@ -21,5 +21,7 @@
     <string name="title_undetected_beacons">Show undetected beacons</string>
     <string name="summary_undetected_beacons">Always show all beacons of the current map</string>
     <string name="map_settings">Map settings</string>
+    <string name="sync_ubudu_manager">Synchronize with Ubudu Manager</string>
+
 
 </resources>
diff --git a/sampleapp/ilapp2/src/main/res/xml/preferences.xml b/sampleapp/ilapp2/src/main/res/xml/preferences.xml
index e76e4d8..def5d4a 100644
--- a/sampleapp/ilapp2/src/main/res/xml/preferences.xml
+++ b/sampleapp/ilapp2/src/main/res/xml/preferences.xml
@@ -40,6 +40,9 @@
         <android.support.v7.preference.Preference
             android:key="indoorlocation_sdk_version"
             android:title="@string/title_indoorlocation_sdk_version" />
+        <android.support.v7.preference.Preference
+            android:key="update_settings"
+            android:title="@string/sync_ubudu_manager" />
     </android.support.v7.preference.PreferenceCategory>
 
 </android.support.v7.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/sampleapp/local.properties b/sampleapp/local.properties
index ed3e1ed..fa556f9 100644
--- a/sampleapp/local.properties
+++ b/sampleapp/local.properties
@@ -1,10 +1,8 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file should *NOT* be checked into Version Control Systems,
+## This file must *NOT* be checked into Version Control Systems,
 # as it contains information specific to your local configuration.
 #
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-sdk.dir=/Users/mgasztold/Library/Android/sdk
\ No newline at end of file
+#Tue Apr 17 15:05:07 CEST 2018
+sdk.dir=/home/amine/Android/Sdk