diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/Features.java b/app/src/main/java/de/apps4ics/mountainnavigation/Features.java
index c3180c8..0fa18e4 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/Features.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/Features.java
@@ -4,9 +4,9 @@
  * Created by Vinz on 06.10.2015.
  */
 public class Features {
-    public static final int SMALL = 0; //Size of fountain
-    public static final int MEDIUM = 1; //Size of fountain
-    public static final int LARGE = 2; //Size of fountain
-    public static final int EXPOSED = 3; //is the path exposed?
-    public static final int DIFF_WET = 4; //difficult path if rain
+    public static final int FOUNTAIN_SMALL = 0; //Size of fountain
+    public static final int FOUNTAIN_MEDIUM = 1; //Size of fountain
+    public static final int FOUNTAIN_LARGE = 2; //Size of fountain
+    public static final int PATH_EXPOSED = 0; //is the path exposed?
+    public static final int PATH_DIFF_WET = 1; //difficult path if rain
 }
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index 9c89f72..b81631b 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -9,7 +9,6 @@
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Color;
-import android.graphics.Typeface;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
@@ -92,7 +91,7 @@
     private DrawerLayout drawerLayout;
     private ListView listView;
 
-    private List<Poi> poiMarkers;
+    private List<Poi>[] poiMarkers;
 
     private String provider;
     private Location mLocation;
@@ -118,7 +117,10 @@
         mapController.setZoom(ZOOM_LEVEL);
         mapController.setCenter(new GeoPoint(48.52, 9.055));
 
-        poiMarkers = new ArrayList<>();
+        poiMarkers = new List[Types.SIZE];
+        for(int i=0; i<poiMarkers.length; ++i){
+            poiMarkers[i] = new ArrayList<>();
+        }
 
         frameLayout.addView(mapView);
 
@@ -225,16 +227,23 @@
             //tv.setTypeface(tf);
             tv.setTextColor(res.getColor(R.color.text_color_selected));
             Toaster("You enabled " + entries[position]);
+            String title = entries[position];
             List<Poi> tempPoiList = dbHandler.getPoiByType(type);
             for(int i=0; i<tempPoiList.size(); ++i){
                 Poi poi = tempPoiList.get(i);
-                poiMarkers.add(poi);
+                poiMarkers[type].add(poi);
                 GeoPoint gp = new GeoPoint(poi.getLat(), poi.getLon());
 
+                ArrayList<Properties> optList = dbHandler.getPoiOptions(poi.getId());
+                for(int j=0; j<optList.size(); ++j){
+                    Properties prop = optList.get(j);
+                    title += " (" + fountainSizes[(int)prop.get_opt_id()] + ")";
+                }
+
                 Marker positionMarker = new Marker(mapView);
                 positionMarker.setPosition(gp);
                 positionMarker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM);
-                positionMarker.setTitle(getString(R.string.osm_marker_title));
+                positionMarker.setTitle(title);
                 positionMarker.setSnippet("Latitude: " + gp.getLatitude() + "\n" + "Longitude: " + gp.getLongitude());
                 positionMarker.setImage(res.getDrawable(entryImgs[type]));
                 Drawable[] iconLayer = new Drawable[2];
@@ -248,8 +257,8 @@
                 LayerDrawable icon = new LayerDrawable(iconLayer);
                 positionMarker.setIcon(icon);
                 mapView.getOverlays().add(positionMarker);
-                mapView.invalidate();
             }
+            mapView.invalidate();
         } else {
             iv.setColorFilter(Color.argb(200, 185, 185, 185));
             iv.setTag("disabled");
@@ -257,13 +266,12 @@
             //Typeface tf = Typeface.create("sans-serif-medium", Typeface.NORMAL);
             //tv.setTypeface(tf);
             Toaster("You disabled " + entries[position]);
-            for(int i=0; i<poiMarkers.size(); ++i){
-                Poi poi = poiMarkers.get(i);
-                if(poi.getType() == type){
-                    poiMarkers.remove(i);
-                    mapView.getOverlays().remove(i);
-                }
+            for(int i=0; i<poiMarkers[type].size(); ++i){
+                Poi poi = poiMarkers[type].get(i);
+                mapView.getOverlays().remove(poi); //TODO does not remove the poi
             }
+            poiMarkers[type] = new ArrayList<>();
+            mapView.invalidate();
         }
     }
 
@@ -443,13 +451,13 @@
                             int size = 0;
                             switch (which) {
                                 case 0:
-                                    size = Features.SMALL;
+                                    size = Features.FOUNTAIN_SMALL;
                                     break;
                                 case 1:
-                                    size = Features.MEDIUM;
+                                    size = Features.FOUNTAIN_MEDIUM;
                                     break;
                                 case 2:
-                                    size = Features.LARGE;
+                                    size = Features.FOUNTAIN_LARGE;
                                     break;
                                 default:
                                     Log.e(TAG, "Wrong fountain size " + which);