diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskListRecyclerViewAdapter.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskListRecyclerViewAdapter.java
index df6c172..2c5de73 100644
--- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskListRecyclerViewAdapter.java
+++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskListRecyclerViewAdapter.java
@@ -53,10 +53,8 @@ public class TaskListRecyclerViewAdapter extends RecyclerView.Adapter<TaskListRe
 
         // Handle inline name change
         holder.mTaskNameView.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-            // TODO: handle exception when onFocus is lost after click on Delete
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
-
                 EditText editText = (EditText) v;
                 String name = editText.getText().toString();
 
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 a5f9625..c1de97f 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
@@ -15,6 +15,7 @@ import android.support.v7.widget.helper.ItemTouchHelper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
 import android.widget.EditText;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
@@ -88,16 +89,13 @@ public class TasksFragment extends Fragment implements
         taskDataAccess = new TaskDataAccess(view.getContext());
         taskDataAccess.open();
 
-        // Set total cycles
-        UpdateCycleCount();
-
-        // Set total count
-        UpdateTaskCount();
-
         // Set RecyclerView Adapter
         taskRecyclerViewAdapter = new TaskRecyclerViewAdapter(taskDataAccess.getAllTasks(taskListId));
         recyclerView.setAdapter(taskRecyclerViewAdapter);
 
+        // Set total cycles
+        UpdateCycleCount();
+
         taskDataAccess.close();
 
         // Set ItemTouch helper in RecyclerView to handle swipe move on elements
@@ -120,13 +118,26 @@ public class TasksFragment extends Fragment implements
                         FragmentManager manager = getFragmentManager();
                         TaskDialogFragment taskDialogFragment = TaskDialogFragment.newInstance(
                                 taskRecyclerViewAdapter.getItem(position),
-                                ((MainActivity.SectionsPagerAdapter)viewPager.getAdapter()).getAllItems(), TasksFragment.this);
+                                ((MainActivity.SectionsPagerAdapter) viewPager.getAdapter()).getAllItems(), TasksFragment.this);
 
                         taskDialogFragment.setArguments(args);
                         taskDialogFragment.show(manager, "Edit task");
                     }
                 })
         );
+
+        // Set total count
+        UpdateTaskCount();
+
+        // Handle updating remaining task count in a listener to be sure that the layout is available
+        recyclerView.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+            @Override
+            public boolean onPreDraw() {
+                UpdateRemainingTaskCount();
+                recyclerView.getViewTreeObserver().removeOnPreDrawListener(this);
+                return true;
+            }
+        });
         return view;
     }
 
@@ -136,8 +147,20 @@ public class TasksFragment extends Fragment implements
     }
 
     private void UpdateTaskCount() {
+        int totalTasks = taskRecyclerViewAdapter.getItemCount();
         TextView totalTasksView = (TextView) view.findViewById(R.id.total_task_count);
-        totalTasksView.setText(String.valueOf(taskDataAccess.getTaskCount(taskListId) + " tasks"));
+        totalTasksView.setText(String.valueOf(totalTasks + " tasks"));
+    }
+
+    private void UpdateRemainingTaskCount() {
+        TextView remainingTasksView = (TextView) view.findViewById(R.id.remaining_task_count);
+        NoScrollingLayoutManager layoutManager = (NoScrollingLayoutManager) recyclerView.getLayoutManager();
+        int remainingTaskCount = taskRecyclerViewAdapter.getItemCount() - layoutManager.getChildCount();
+        if (remainingTaskCount == 0)
+            remainingTasksView.setText("");
+        else
+            remainingTasksView.setText(String.valueOf(
+                    remainingTaskCount + " task" + (remainingTaskCount > 1 ? "s" : "") +" remaining"));
     }
 
     /** Performs an action on a task: done, next or delete */
@@ -214,9 +237,10 @@ public class TasksFragment extends Fragment implements
                 }
 
                 UpdateCycleCount();
-                UpdateTaskCount();
-
                 taskDataAccess.close();
+
+                UpdateTaskCount();
+                UpdateRemainingTaskCount();
             }
         }).show();
     }
@@ -285,18 +309,22 @@ public class TasksFragment extends Fragment implements
                 priorityRadio.getText().toString(),
                 taskList.getId());
 
-        UpdateTaskCount();
         taskDataAccess.close();
-        // Update the corresponding tab adapter
+
 
         Bundle args = dialog.getArguments();
         // Should never happen because we will have to be on this tab to open the dialog
         if (taskRecyclerViewAdapter == null) return;
 
         // Add the task
-        if (task == null)
+        if (task == null) {
             taskRecyclerViewAdapter.add(newTask, 0);
-            // Update the task
+            recyclerView.scrollToPosition(0);
+
+            // Update the task count
+            UpdateTaskCount();
+        }
+        // Update the task
         else {
             int position = args.getInt("position");
             // Check if task list was changed
@@ -307,9 +335,10 @@ public class TasksFragment extends Fragment implements
 
                 // Add it to the corresponding tab provided it is already instanciated
                 mAdapter.onTaskListChanged(newTask, listSpinner.getSelectedItemPosition());
-            }
-            else taskRecyclerViewAdapter.update(newTask, position);
+            } else taskRecyclerViewAdapter.update(newTask, position);
         }
+
+        UpdateRemainingTaskCount();
     }
 
     @Override
diff --git a/DoNExt/app/src/main/res/layout/activity_main.xml b/DoNExt/app/src/main/res/layout/activity_main.xml
index be78694..c9abe80 100644
--- a/DoNExt/app/src/main/res/layout/activity_main.xml
+++ b/DoNExt/app/src/main/res/layout/activity_main.xml
@@ -20,7 +20,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
-            app:layout_scrollFlags="scroll|enterAlways"
+            app:layout_scrollFlags="enterAlways"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
         <android.support.design.widget.TabLayout
diff --git a/DoNExt/app/src/main/res/layout/fragment_tasks.xml b/DoNExt/app/src/main/res/layout/fragment_tasks.xml
index f24d289..b0b4f45 100644
--- a/DoNExt/app/src/main/res/layout/fragment_tasks.xml
+++ b/DoNExt/app/src/main/res/layout/fragment_tasks.xml
@@ -6,23 +6,31 @@
     android:layout_height="match_parent" >
     <TextView
         android:id="@+id/total_task_cycles"
-        android:layout_width="wrap_content"
+        android:layout_width="100dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true" />
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"/>
     <TextView
         android:id="@+id/total_task_count"
-        android:layout_width="wrap_content"
+        android:layout_width="100dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true" />
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true" />
     <android.support.v7.widget.RecyclerView
         android:id="@+id/task_list_view"
         android:name="com.wismna.geoffroy.donext.activities.TaskFragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="410dp"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
         android:layout_below="@id/total_task_cycles"
         app:layoutManager="LinearLayoutManager"
         tools:context=".fragments.TasksFragment"
         tools:listitem="@layout/fragment_task" />
+    <TextView
+        android:id="@+id/remaining_task_count"
+        android:layout_width="150dp"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_below="@id/task_list_view" />
 </RelativeLayout>
\ No newline at end of file