diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index 99ef638..df72945 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -28,6 +28,7 @@
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TableLayout;
@@ -120,8 +121,8 @@
 
     private ActionBarDrawerToggle drawerToggle;
     private DrawerLayout drawerLayout;
-    private ListView poiView;
-    private ListView menuView;
+    private LinearLayout poiView;
+    private LinearLayout menuView;
     private ImageView weatherSymbol;
     private ImageView weatherWarning;
     private TextView weatherCity;
@@ -196,8 +197,8 @@
             }
         });
         drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
-        menuView = (ListView) findViewById(R.id.menuList);
-        poiView = (ListView) findViewById(R.id.poiList);
+        menuView = (LinearLayout) findViewById(R.id.menuList);
+        poiView = (LinearLayout) findViewById(R.id.poiList);
         weatherSymbol = (ImageView) findViewById(R.id.weather_symbol);
         weatherWarning = (ImageView) findViewById(R.id.warning_symbol);
         weatherCity = (TextView) findViewById(R.id.weather_city);
@@ -208,35 +209,41 @@
 
 //      poiView.setItemsCanFocus(false);
         ImageListAdapter adapter = new ImageListAdapter(MainActivity.this, PoiHandler.getEntries(), PoiHandler.getEntryImgs(), false);
-        poiView.setAdapter(adapter);
-        poiView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                TableLayout layout = (TableLayout) view;
-                toggleDrawerItems(layout, position);
-                //drawerLayout.closeDrawers(); //TODO close drawer on click?
-            }
-        });
+        for(int i=0; i<adapter.getCount(); i++) {
+            final TableLayout row = (TableLayout) adapter.getView(i, null, poiView);
+            final int position = i;
+            row.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    toggleDrawerItems(row, position);
+                }
+            });
+            poiView.addView(row);
+        }
 
         String[] menuEntries = res.getStringArray(R.array.menuEntries);
         ArrayAdapter<String> menuAdapter = new ArrayAdapter<>(MainActivity.this, R.layout.drawer_list_simple, menuEntries);
-        menuView.setAdapter(menuAdapter);
-        menuView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                String key = res.getStringArray(R.array.menuEntriesKeys)[position];
-                if(key.equals(getString(R.string.menu_title_about_key))) {
-                    Intent about = new Intent(MainActivity.this, AboutActivity.class);
-                    startActivity(about);
-                } else if(key.equals(getString(R.string.menu_title_settings_key))) {
-                    Intent settings = new Intent(MainActivity.this, SettingsActivity.class);
-                    startActivity(settings);
-                } else if(key.equals(getString(R.string.menu_title_download_key))) {
-                    Intent download = new Intent(MainActivity.this, DownloadActivity.class);
-                    startActivity(download);
+        for(int i=0; i<menuAdapter.getCount(); i++) {
+            final int position = i;
+            View view = menuAdapter.getView(i, null, menuView);
+            view.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    String key = res.getStringArray(R.array.menuEntriesKeys)[position];
+                    if(key.equals(getString(R.string.menu_title_about_key))) {
+                        Intent about = new Intent(MainActivity.this, AboutActivity.class);
+                        startActivity(about);
+                    } else if(key.equals(getString(R.string.menu_title_settings_key))) {
+                        Intent settings = new Intent(MainActivity.this, SettingsActivity.class);
+                        startActivity(settings);
+                    } else if(key.equals(getString(R.string.menu_title_download_key))) {
+                        Intent download = new Intent(MainActivity.this, DownloadActivity.class);
+                        startActivity(download);
+                    }
                 }
-            }
-        });
+            });
+            menuView.addView(view);
+        }
 
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         getSupportActionBar().setHomeButtonEnabled(true);
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index dd4948a..9b89cc1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -135,18 +135,20 @@
                             android:textStyle="italic"/>
                     </LinearLayout>
                 </LinearLayout>
-                <ListView
+                <LinearLayout
                     xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
                     android:name="de.apps4ics.mountainnavigation.NavigationDrawerFragment"
                     android:layout_height="wrap_content" android:choiceMode="singleChoice"
                     android:divider="@android:color/transparent" android:dividerHeight="0dp"
                     android:background="#ffff" tools:context=".NavigationDrawerFragment"
-                    android:id="@+id/poiList"/>
-                <ListView android:layout_width="match_parent"
+                    android:id="@+id/poiList"
+                    android:orientation="vertical" />
+                <LinearLayout android:layout_width="match_parent"
                     android:layout_height="wrap_content" android:choiceMode="singleChoice"
                     android:divider="@android:color/transparent" android:dividerHeight="0dp"
                     android:background="#ffff" tools:context=".NavigationDrawerFragment"
-                    android:id="@+id/menuList" />
+                    android:id="@+id/menuList"
+                    android:orientation="vertical" />
         </LinearLayout>
     </ScrollView>
 </android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/drawer_list_item.xml b/app/src/main/res/layout/drawer_list_item.xml
index 97485d8..47cd051 100644
--- a/app/src/main/res/layout/drawer_list_item.xml
+++ b/app/src/main/res/layout/drawer_list_item.xml
@@ -27,7 +27,8 @@
         android:layout_marginStart="16dp"
         android:layout_marginLeft="16dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp">
+        android:layout_marginRight="16dp"
+        android:background="?attr/selectableItemBackground" >
         <ImageView
             android:id="@+id/toggleEntryImg"
             android:layout_width="24dp"
diff --git a/app/src/main/res/layout/drawer_list_simple.xml b/app/src/main/res/layout/drawer_list_simple.xml
index d4e4b6c..691b6eb 100644
--- a/app/src/main/res/layout/drawer_list_simple.xml
+++ b/app/src/main/res/layout/drawer_list_simple.xml
@@ -6,7 +6,8 @@
     android:layout_marginLeft="16dp"
     android:layout_marginEnd="16dp"
     android:layout_marginRight="16dp"
-    android:gravity="center_horizontal"
+    android:gravity="center_vertical"
     android:textSize="14sp"
     android:textColor="@color/text_color"
-    android:fontFamily="sans-serif-medium" />
+    android:fontFamily="sans-serif-medium"
+    android:background="?attr/selectableItemBackground"  />