diff --git a/DoNExt/app/build.gradle b/DoNExt/app/build.gradle
index fffe235..170505a 100644
--- a/DoNExt/app/build.gradle
+++ b/DoNExt/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.wismna.geoffroy.donext"
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 20
-        versionName "1.4.5"
+        versionCode 21
+        versionName "1.4.6"
     }
     buildTypes {
         release {
diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskRecyclerViewAdapter.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskRecyclerViewAdapter.java
index 4809e46..1570fd6 100644
--- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskRecyclerViewAdapter.java
+++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskRecyclerViewAdapter.java
@@ -24,9 +24,11 @@ public class TaskRecyclerViewAdapter extends RecyclerView.Adapter<TaskRecyclerVi
 
     private List<Task> mValues;
     private int viewType;
+    private boolean mIsToday;
 
-    public TaskRecyclerViewAdapter(List<Task> items, int viewType) {
+    public TaskRecyclerViewAdapter(List<Task> items, int viewType, boolean isToday) {
         mValues = items;
+        mIsToday = isToday;
         this.viewType = viewType;
     }
 
@@ -49,21 +51,27 @@ public class TaskRecyclerViewAdapter extends RecyclerView.Adapter<TaskRecyclerVi
 
     @Override
     public void onBindViewHolder(final SimpleViewHolder holder, int position) {
+        // Set basic information
         holder.mItem = mValues.get(position);
         holder.mIdView.setText(String.valueOf(holder.mItem.getId()));
-        LocalDate dueDate = holder.mItem.getDueDate();
-        if(dueDate != null && dueDate.isBefore(LocalDate.now()))
-            holder.mAlarmView.setImageResource(R.drawable.ic_access_alarm);
         holder.mCycleView.setText(String.valueOf(holder.mItem.getCycle()));
         holder.mTitleView.setText(holder.mItem.getName());
+        // Set optional description
         if (holder instanceof DetailedViewHolder)
             ((DetailedViewHolder)holder).mDescriptionView.setText(holder.mItem.getDescription());
-        int priority = holder.mItem.getPriority();
-
-        // Reset task rendering
+        // Set task rendering
         holder.mTitleView.setTypeface(Typeface.DEFAULT);
         holder.mTitleView.setTextColor(Color.BLACK);
 
+        // Additional information will not be displayed in Today view
+        if (mIsToday) return;
+        // Set alarm if past due date
+        LocalDate dueDate = holder.mItem.getDueDate();
+        if(dueDate != null && dueDate.isBefore(LocalDate.now()))
+            holder.mAlarmView.setImageResource(R.drawable.ic_access_alarm);
+        int priority = holder.mItem.getPriority();
+
+        // Set priority
         switch (priority)
         {
             case 0:
diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java
index de447be..421f272 100644
--- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java
+++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java
@@ -10,6 +10,7 @@ import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.helper.ItemTouchHelper;
@@ -105,12 +106,15 @@ public class TasksFragment extends Fragment implements
         try (TaskDataAccess taskDataAccess = new TaskDataAccess(view.getContext())) {
             taskRecyclerViewAdapter = new TaskRecyclerViewAdapter(
                     isTodayView? taskDataAccess.getTodayTasks() : taskDataAccess.getAllTasksFromList(taskListId),
-                    Integer.valueOf(sharedPref.getString("pref_conf_task_layout", "1")));
+                    Integer.valueOf(sharedPref.getString("pref_conf_task_layout", "1")), isTodayView);
         }
         recyclerView.setAdapter(taskRecyclerViewAdapter);
 
         // Set ItemTouch helper in RecyclerView to handle swipe move on elements
-        ItemTouchHelper.Callback callback = new TaskTouchHelper(this);
+        final Resources resources = getResources();
+        ItemTouchHelper.Callback callback = new TaskTouchHelper(this,
+                ContextCompat.getColor(context, R.color.colorAccent),
+                ContextCompat.getColor(context, R.color.colorPrimary));
         ItemTouchHelper helper = new ItemTouchHelper(callback);
         helper.attachToRecyclerView(recyclerView);
 
@@ -119,7 +123,7 @@ public class TasksFragment extends Fragment implements
                 new RecyclerItemClickListener(context, new RecyclerItemClickListener.OnItemClickListener() {
                     @Override
                     public void onItemClick(View view, int position) {
-                        boolean isLargeLayout = getResources().getBoolean(R.bool.large_layout);
+                        boolean isLargeLayout = resources.getBoolean(R.bool.large_layout);
                         SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getContext());
                         Bundle args = new Bundle();
                         args.putInt("position", position);
diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskTouchHelper.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskTouchHelper.java
index 311c90e..65ce2d2 100644
--- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskTouchHelper.java
+++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskTouchHelper.java
@@ -23,10 +23,14 @@ public class TaskTouchHelper extends ItemTouchHelper.SimpleCallback {
     }
 
     private final TaskTouchHelperAdapter mAdapter;
+    private int colorDone;
+    private int colorNext;
 
-    public TaskTouchHelper(TaskTouchHelperAdapter adapter){
+    public TaskTouchHelper(TaskTouchHelperAdapter adapter, int colorDone, int colorNext){
         // No drag moves, no swipes (except for 1st element, see getSwipeDirs method)
         super(0, 0);
+        this.colorDone = colorDone;
+        this.colorNext = colorNext;
         this.mAdapter = adapter;
     }
 
@@ -53,25 +57,9 @@ public class TaskTouchHelper extends ItemTouchHelper.SimpleCallback {
                             float dX, float dY, int actionState, boolean isCurrentlyActive) {
         // Get RecyclerView item from the ViewHolder
         View itemView = viewHolder.itemView;
-        //View backgroundView = recyclerView.getRootView().findViewById(R.id.task_list_background);
-        //View textView;
-        /*if (dX > 0) {
-            textView = recyclerView.getRootView().findViewById(R.id.task_background_next);
-        } else {
-            textView = recyclerView.getRootView().findViewById(R.id.task_background_done);
-        }
-        //backgroundView.setY(itemView.getTop());
 
-        if (isCurrentlyActive) {
-            backgroundView.setVisibility(View.VISIBLE);
-            textView.setVisibility(View.VISIBLE);
-        } else {
-            backgroundView.setVisibility(View.GONE);
-            textView.setVisibility(View.GONE);
-        }*/
         if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
             Paint background = new Paint();
-            background.setARGB(255, 222, 222, 222);
 
             TextPaint textPaint = new TextPaint();
             textPaint.setAntiAlias(true);
@@ -80,9 +68,11 @@ public class TaskTouchHelper extends ItemTouchHelper.SimpleCallback {
 
             int heightOffset = itemView.getHeight() / 2 - (int)textPaint.getTextSize() / 2;
             int widthOffset = 30;
-            // Set your color for positive displacement
             if (dX > 0) {
+                // Set your color for positive displacement
+                //background.setARGB(255, 222, 222, 222);
                 //p.setARGB(255, 204, 229, 255);
+                background.setColor(colorNext);
                 // Draw Rect with varying right side, equal to displacement dX
                 Rect rect = new Rect(itemView.getLeft(), itemView.getTop(), (int) dX,
                         itemView.getBottom());
@@ -99,6 +89,7 @@ public class TaskTouchHelper extends ItemTouchHelper.SimpleCallback {
 
             } else {
                 // Set your color for negative displacement
+                background.setColor(colorDone);
                 //p.setARGB(255, 204, 255, 229);
                 // Draw Rect with varying left side, equal to the item's right side plus negative displacement dX
                 Rect rect = new Rect(itemView.getRight() + (int)dX, itemView.getTop(),
diff --git a/DoNExt/app/src/main/res/layout/content_task_form.xml b/DoNExt/app/src/main/res/layout/content_task_form.xml
index 4fd3298..181e582 100644
--- a/DoNExt/app/src/main/res/layout/content_task_form.xml
+++ b/DoNExt/app/src/main/res/layout/content_task_form.xml
@@ -36,7 +36,8 @@
             android:textSize="30sp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/new_task_list"/>
+            android:layout_below="@id/new_task_list"
+            android:imeOptions="flagNoFullscreen"/>
         <EditText
             android:id="@+id/new_task_description"
             android:hint="@string/new_task_description_hint"
@@ -45,7 +46,8 @@
             android:layout_marginTop="10dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/new_task_name" />
+            android:layout_below="@id/new_task_name"
+            android:imeOptions="flagNoFullscreen" />
         <TextView
             android:id="@+id/new_task_priority_label"
             android:text="@string/new_task_priority"
diff --git a/DoNExt/app/src/main/res/layout/content_today_form.xml b/DoNExt/app/src/main/res/layout/content_today_form.xml
index b01013d..20a581b 100644
--- a/DoNExt/app/src/main/res/layout/content_today_form.xml
+++ b/DoNExt/app/src/main/res/layout/content_today_form.xml
@@ -13,7 +13,8 @@
         android:inputType="text"
         android:textSize="30sp"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:imeOptions="flagNoFullscreen" />
     <ListView
         android:id="@+id/today_tasks"
         android:layout_width="match_parent"