diff --git a/app/app.iml b/app/app.iml
index 85d9066..4ae59e2 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -12,10 +12,7 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
         <afterSyncTasks>
-          <task>generateDebugAndroidTestSources</task>
           <task>generateDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -28,7 +25,7 @@
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -50,6 +47,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -57,6 +61,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <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/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" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <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/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" />
@@ -65,10 +76,8 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/22.2.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars" />
@@ -78,27 +87,26 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/osmbonuspack_v5.7/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="weatherlib_okhttpclient-1.6.0" level="project" />
-    <orderEntry type="library" exported="" name="osmdroid-android-5.1" level="project" />
-    <orderEntry type="library" exported="" name="osmbonuspack_v5.7-" level="project" />
     <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="okhttp-2.2.0" level="project" />
     <orderEntry type="library" exported="" name="gson-2.3" level="project" />
-    <orderEntry type="library" exported="" name="commons-lang3-3.3.2" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="design-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="okio-1.2.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
     <orderEntry type="library" exported="" name="weatherlib-1.6.0" level="project" />
+    <orderEntry type="library" exported="" name="osmdroid-android-5.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
+    <orderEntry type="library" exported="" name="osmbonuspack_v5.7-" level="project" />
+    <orderEntry type="library" exported="" name="okhttp-2.2.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
+    <orderEntry type="library" exported="" name="commons-lang3-3.3.2" level="project" />
+    <orderEntry type="library" exported="" name="design-22.2.1" level="project" />
+    <orderEntry type="library" exported="" name="okio-1.2.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index c74cdd9..c71f0b7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@
 
 android {
     compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    buildToolsVersion '23.0.2'
 
     defaultConfig {
         applicationId "de.apps4ics.mountainnavigation"
diff --git a/app/src/main/cable_car-web.png b/app/src/main/cable_car-web.png
new file mode 100644
index 0000000..d8c8e08
--- /dev/null
+++ b/app/src/main/cable_car-web.png
Binary files differ
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index 55150a0..a385503 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -253,7 +253,7 @@
                 R.drawable.image_upload,
                 R.drawable.cell_reception,
                 R.drawable.wifi,
-                R.drawable.lift
+                R.mipmap.cable_car
         };
 
         WeatherClient.ClientBuilder weatherBuilder = new WeatherClient.ClientBuilder();
@@ -1132,9 +1132,13 @@
         popupMapView.getOverlays().add(overlay);
     }
 
-    private void addCellReceptionPoi(){
+    public boolean hasInternet() {
         setActiveNetwork();
-        if(activeNetwork != null && activeNetwork.isConnected()){
+        return activeNetwork != null && activeNetwork.isConnected();
+    }
+
+    private void addCellReceptionPoi(){
+       if(hasInternet()){
             if(tm != null && networkStrength != -1){
                 String opName = tm.getNetworkOperatorName();
                 String opCountry = tm.getNetworkCountryIso();
@@ -1171,8 +1175,7 @@
             AlertDialog wifiIntentDialog = wifiIntentDialogBuilder.create();
             wifiIntentDialog.show();
         } else {
-            setActiveNetwork();
-            if (activeNetwork != null && activeNetwork.isConnected()) {
+           if(hasInternet()){
                 if (activeNetwork.getType() == ConnectivityManager.TYPE_WIFI) {
                     String ssid = wm.getConnectionInfo().getSSID();
                     int rssi = wm.getConnectionInfo().getRssi();
diff --git a/app/src/main/path_giddiness-web.png b/app/src/main/path_giddiness-web.png
index 9d74af5..d270e45 100644
--- a/app/src/main/path_giddiness-web.png
+++ b/app/src/main/path_giddiness-web.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/cable_car.png b/app/src/main/res/mipmap-hdpi/cable_car.png
new file mode 100644
index 0000000..7e715ab
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/cable_car.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/path_giddiness.png b/app/src/main/res/mipmap-hdpi/path_giddiness.png
index aeb6232..3330a9c 100644
--- a/app/src/main/res/mipmap-hdpi/path_giddiness.png
+++ b/app/src/main/res/mipmap-hdpi/path_giddiness.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/cable_car.png b/app/src/main/res/mipmap-mdpi/cable_car.png
new file mode 100644
index 0000000..96c2330
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/cable_car.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/path_giddiness.png b/app/src/main/res/mipmap-mdpi/path_giddiness.png
index 1eddb67..98dde6a 100644
--- a/app/src/main/res/mipmap-mdpi/path_giddiness.png
+++ b/app/src/main/res/mipmap-mdpi/path_giddiness.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/cable_car.png b/app/src/main/res/mipmap-xhdpi/cable_car.png
new file mode 100644
index 0000000..210c7e6
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/cable_car.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/path_giddiness.png b/app/src/main/res/mipmap-xhdpi/path_giddiness.png
index fb9a20c..7c1df3e 100644
--- a/app/src/main/res/mipmap-xhdpi/path_giddiness.png
+++ b/app/src/main/res/mipmap-xhdpi/path_giddiness.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/cable_car.png b/app/src/main/res/mipmap-xxhdpi/cable_car.png
new file mode 100644
index 0000000..dee8a6b
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/cable_car.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/path_giddiness.png b/app/src/main/res/mipmap-xxhdpi/path_giddiness.png
index 38901be..c279158 100644
--- a/app/src/main/res/mipmap-xxhdpi/path_giddiness.png
+++ b/app/src/main/res/mipmap-xxhdpi/path_giddiness.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/cable_car.png b/app/src/main/res/mipmap-xxxhdpi/cable_car.png
new file mode 100644
index 0000000..0f3aa16
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/cable_car.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/path_giddiness.png b/app/src/main/res/mipmap-xxxhdpi/path_giddiness.png
index e991698..e66360c 100644
--- a/app/src/main/res/mipmap-xxxhdpi/path_giddiness.png
+++ b/app/src/main/res/mipmap-xxxhdpi/path_giddiness.png
Binary files differ