diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index 56069b9..42fb4fb 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -61,10 +61,9 @@
 import android.widget.EditText;
 import android.widget.ExpandableListView;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.Spinner;
-import android.widget.TableLayout;
-import android.widget.TableRow;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -289,8 +288,8 @@
         poiView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() {
             @Override
             public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
-                TableLayout tbl = (TableLayout) v;
-                toggleDrawerItems(tbl, childPosition);
+                LinearLayout layout = (LinearLayout) v;
+                toggleDrawerItems(layout, childPosition);
                 return false;
             }
         });
@@ -590,27 +589,11 @@
         long gp_id = dbHandler.addPoi(dbgp);
     }
 
-    private void toggleDrawerItems(TableLayout layout, int position){
-        TableRow tr = (TableRow) layout.getChildAt(0);
-        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!");
-            return;
-        }
+    private void toggleDrawerItems(LinearLayout layout, int position){
+        LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        inflater.inflate(R.layout.drawer_list_item, null);
+        TextView tv = (TextView) layout.findViewById(R.id.toggleEntryDesc);
+        ImageView iv = (ImageView) layout.findViewById(R.id.toggleEntryImg);
         int type = getType(position);
         if(iv.getTag() == null || iv.getTag() == "disabled"){
             iv.setColorFilter(null);
diff --git a/app/src/main/res/layout/drawer_list_item.xml b/app/src/main/res/layout/drawer_list_item.xml
index 83f30e1..1e713ca 100644
--- a/app/src/main/res/layout/drawer_list_item.xml
+++ b/app/src/main/res/layout/drawer_list_item.xml
@@ -19,31 +19,28 @@
 	*
 	* Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
 -->
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <TableRow
-        android:layout_height="48dp"
+    android:layout_height="48dp">
+    <ImageView
+        android:id="@+id/toggleEntryImg"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
         android:layout_marginStart="16dp"
         android:layout_marginLeft="16dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp" >
-        <ImageView
-            android:id="@+id/toggleEntryImg"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_gravity="center_vertical"
-            android:gravity="center_vertical"/>
-        <TextView
-            android:id="@+id/toggleEntryDesc"
-            android:layout_width="wrap_content"
-            android:layout_height="48dp"
-            android:layout_marginStart="32dp"
-            android:layout_marginLeft="32dp"
-            android:textSize="14sp"
-            android:textColor="@color/text_color"
-            android:fontFamily="sans-serif-medium"
-            android:layout_gravity="center_vertical"
-            android:gravity="center_vertical"/>
-    </TableRow>
-</TableLayout>
\ No newline at end of file
+        android:layout_marginRight="16dp"
+        android:layout_gravity="center_vertical"
+        android:gravity="center_vertical"/>
+    <TextView
+        android:id="@+id/toggleEntryDesc"
+        android:layout_width="wrap_content"
+        android:layout_height="48dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:textSize="14sp"
+        android:textColor="@color/text_color"
+        android:fontFamily="sans-serif-medium"
+        android:layout_gravity="center_vertical"
+        android:gravity="center_vertical"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_list_simple.xml b/app/src/main/res/layout/drawer_list_simple.xml
index 147b7af..0a85002 100644
--- a/app/src/main/res/layout/drawer_list_simple.xml
+++ b/app/src/main/res/layout/drawer_list_simple.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <TableRow
+    android:layout_height="48dp">
+    <TextView
+        android:id="@+id/simple_textview"
         android:layout_height="48dp"
+        android:layout_width="match_parent"
         android:layout_marginStart="16dp"
         android:layout_marginLeft="16dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp" >
-        <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/simple_textview"
-            android:layout_height="48dp"
-            android:layout_width="match_parent"
-            android:gravity="center_vertical"
-            android:textSize="14sp"
-            android:textColor="@color/text_color"
-            android:fontFamily="sans-serif-medium" />
-    </TableRow>
-</TableLayout>
\ No newline at end of file
+        android:layout_marginRight="16dp"
+        android:gravity="center_vertical"
+        android:textSize="14sp"
+        android:textColor="@color/text_color"
+        android:fontFamily="sans-serif-medium" />
+</LinearLayout>
\ No newline at end of file