diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index 2a8473a..2c46929 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -84,6 +84,8 @@
     private DrawerLayout drawerLayout;
     private ListView listView;
 
+    private List<Poi> poiMarkers;
+
     private String provider;
     private Location mLocation;
     private LocationManager locationManager;
@@ -169,40 +171,101 @@
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 TableLayout layout = (TableLayout) view;
-                TableRow tr = (TableRow) layout.getChildAt(0); //TODO is tablerow?
-                TextView tv = null;
-                ImageView iv = null;
-                for(int i=0; i<tr.getChildCount(); ++i){
-                    View v = tr.getChildAt(i);
-                    try {
-                        tv = (TextView) v;
-                    } catch(ClassCastException cce){
-                        Log.e(TAG, "Could not cast " + v.getClass().toString() + " to TextView!");
-                    }
-                    try {
-                        iv = (ImageView) v;
-                    } catch(ClassCastException cce){
-                        Log.e(TAG, "Could not cast " + v.getClass().toString() + " to ImageView!");
-                    }
-                }
-                if(tv == null || iv == null) Log.e(TAG, "Neither TextView nor ImageView can be null!");
-                if(iv.getTag() != "disabled"){
-                    iv.setColorFilter(Color.argb(200, 185, 185, 185));
-                    iv.setTag("disabled");
-                    tv.setTypeface(null, Typeface.NORMAL);
-                    Toaster("You disabled " + entries[position]);
-                } else {
-                    iv.setColorFilter(null);
-                    iv.setTag("");
-                    tv.setTypeface(null, Typeface.BOLD);
-                    Toaster("You enabled " + entries[position]);
-                }
+                toggleDrawerItems(layout, position);
             }
         });
 
         drawerLayout.setDrawerListener(drawerToggle);
     }
 
+    private void toggleDrawerItems(TableLayout layout, int position){
+        TableRow tr = (TableRow) layout.getChildAt(0); //TODO is tablerow?
+        TextView tv = null;
+        ImageView iv = null;
+        for(int i=0; i<tr.getChildCount(); ++i){
+            View v = tr.getChildAt(i);
+            try {
+                tv = (TextView) v;
+            } catch(ClassCastException cce){
+                //Log.e(TAG, "Could not cast " + v.getClass().toString() + " to TextView!");
+            }
+            try {
+                iv = (ImageView) v;
+            } catch(ClassCastException cce){
+                //Log.e(TAG, "Could not cast " + v.getClass().toString() + " to ImageView!");
+            }
+        }
+        if(tv == null || iv == null) Log.e(TAG, "Neither TextView nor ImageView can be null!");
+        int type = getType(position);
+        if(iv.getTag() == null || iv.getTag() == "disabled"){
+            iv.setColorFilter(null);
+            iv.setTag("");
+            tv.setTypeface(null, Typeface.BOLD);
+            Toaster("You enabled " + entries[position]);
+            List<Poi> tempPoiList = dbHandler.getPoiByType(type);
+            for(int i=0; i<tempPoiList.size(); ++i){
+                Poi poi = tempPoiList.get(i);
+                poiMarkers.add(poi);
+                GeoPoint gp = new GeoPoint(poi.getLat(), poi.getLon());
+
+                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.setSnippet("Latitude: " + gp.getLatitude() + "\n" + "Longitude: " + gp.getLongitude());
+                positionMarker.setImage(getDrawable(entryImgs[type]));
+                mapView.getOverlays().add(positionMarker);
+                mapView.invalidate();
+            }
+        } else {
+            iv.setColorFilter(Color.argb(200, 185, 185, 185));
+            iv.setTag("disabled");
+            tv.setTypeface(null, Typeface.NORMAL);
+            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);
+                }
+            }
+        }
+    }
+
+    private int getType(int position){
+        int type;
+        switch (position){
+            case 0:
+                type = Types.FOUNTAIN;
+                break;
+            case 1:
+                type = Types.PATH;
+                break;
+            case 2:
+                type = Types.BREAK_POINT;
+                break;
+            case 3:
+                type = Types.TRASH_BIN;
+                break;
+            case 4:
+                type = Types.PIC;
+                break;
+            case 5:
+                type = Types.CELL_RECEPTION;
+                break;
+            case 6:
+                type = Types.WIFI;
+                break;
+            case 7:
+                type = Types.LIFT;
+                break;
+            default:
+                type = 0;
+                break;
+        }
+        return type;
+    }
+
     private void initGps(){
         locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
         boolean isLocationEnabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
@@ -224,6 +287,16 @@
         else Toast.makeText(getApplicationContext(), text, Toast.LENGTH_SHORT).show();
     }
 
+    private void addSimpleMarker(GeoPoint gp){
+        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.setSnippet("Latitude: " + gp.getLatitude() + "\n" + "Longitude: " + gp.getLongitude());
+        mapView.getOverlays().add(positionMarker);
+        mapView.invalidate();
+    }
+
     @Override
     public void onLocationChanged(Location location) {
         mLocation = location;
@@ -233,13 +306,7 @@
         double lon = location.getLongitude();
         GeoPoint gp = new GeoPoint(lat, lon);
 
-        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.setSnippet("Latitude: " + lat + "\n" + "Longitude: " + lon);
-        mapView.getOverlays().add(positionMarker);
-        mapView.invalidate();
+        addSimpleMarker(gp);
 
         mapController.setCenter(gp);