diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java
index 6875699..080e629 100644
--- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java
+++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java
@@ -20,7 +20,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.ListAdapter;
 import android.widget.ListView;
 
 import com.wismna.geoffroy.donext.R;
@@ -105,12 +104,12 @@ public class MainActivity extends AppCompatActivity implements TasksFragment.Tas
             }
             else if (tabs instanceof ListView) {
                 ListView listView = (ListView) tabs;
-                listView.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, taskLists));
+                listView.setAdapter(new ArrayAdapter<>(this, R.layout.list_tasklist_item, taskLists));
                 listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                     @Override
                     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                         mViewPager.setCurrentItem(position);
-                        view.setSelected(true);
+                        //view.setSelected(true);
                     }
                 });
             }
diff --git a/DoNExt/app/src/main/res/drawable/tasklist_select.xml b/DoNExt/app/src/main/res/drawable/tasklist_select.xml
new file mode 100644
index 0000000..213d267
--- /dev/null
+++ b/DoNExt/app/src/main/res/drawable/tasklist_select.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/colorAccent" android:state_selected="true" />
+    <item android:drawable="@android:color/black" />
+</selector>
\ No newline at end of file
diff --git a/DoNExt/app/src/main/res/layout-large/activity_main.xml b/DoNExt/app/src/main/res/layout-large/activity_main.xml
index 2e4b32b..f2f009d 100644
--- a/DoNExt/app/src/main/res/layout-large/activity_main.xml
+++ b/DoNExt/app/src/main/res/layout-large/activity_main.xml
@@ -41,7 +41,7 @@
             android:id="@+id/tabs"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="0.2"/>
+            android:layout_weight="0.2" />
         <com.wismna.geoffroy.donext.widgets.NonSwipeableViewPager
             android:id="@+id/container"
             android:layout_width="0dp"
diff --git a/DoNExt/app/src/main/res/layout/fragment_task_form.xml b/DoNExt/app/src/main/res/layout/fragment_task_form.xml
index 0e66122..45363be 100644
--- a/DoNExt/app/src/main/res/layout/fragment_task_form.xml
+++ b/DoNExt/app/src/main/res/layout/fragment_task_form.xml
@@ -29,7 +29,9 @@
             android:id="@+id/new_task_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/new_task_name_hint" />
+            android:hint="@string/new_task_name_hint"
+            android:maxLines="1"
+            android:inputType="text" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/DoNExt/app/src/main/res/layout/fragment_tasklists.xml b/DoNExt/app/src/main/res/layout/fragment_tasklists.xml
index 6c6b346..134fc32 100644
--- a/DoNExt/app/src/main/res/layout/fragment_tasklists.xml
+++ b/DoNExt/app/src/main/res/layout/fragment_tasklists.xml
@@ -23,7 +23,9 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="2"
-            android:hint="@string/task_list_new_list_hint"/>
+            android:hint="@string/task_list_new_list_hint"
+            android:maxLines="1"
+            android:inputType="text" />
         <Button
             android:id="@+id/new_task_list_button"
             android:layout_width="80dp"
diff --git a/DoNExt/app/src/main/res/layout/list_tasklist_item.xml b/DoNExt/app/src/main/res/layout/list_tasklist_item.xml
new file mode 100644
index 0000000..26b6c5c
--- /dev/null
+++ b/DoNExt/app/src/main/res/layout/list_tasklist_item.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="20dp"
+    android:textSize="20sp"
+    android:textColor="@drawable/tasklist_select"
+    android:duplicateParentState="true" />
\ No newline at end of file
diff --git a/DoNExt/app/src/main/res/xml/preferences.xml b/DoNExt/app/src/main/res/xml/preferences.xml
index 6ff04b4..3c3bb6d 100644
--- a/DoNExt/app/src/main/res/xml/preferences.xml
+++ b/DoNExt/app/src/main/res/xml/preferences.xml
@@ -34,6 +34,6 @@
             android:entries="@array/settings_max_lists_number"
             android:entryValues="@array/settings_max_lists_number"
             android:summary="%s"
-            android:defaultValue="3" />
+            android:defaultValue="5" />
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file