diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 87587bf..509a532 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/modules.xml b/.idea/modules.xml
index f3677ad..e72d89c 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/donext.iml" filepath="$PROJECT_DIR$/donext.iml" />
+      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/com/wismna/geoffroy/donext/database/TaskDataAccess.java b/app/src/main/java/com/wismna/geoffroy/donext/database/TaskDataAccess.java
index 2d7fec4..c183434 100644
--- a/app/src/main/java/com/wismna/geoffroy/donext/database/TaskDataAccess.java
+++ b/app/src/main/java/com/wismna/geoffroy/donext/database/TaskDataAccess.java
@@ -120,7 +120,7 @@ public class TaskDataAccess implements AutoCloseable {
                         " AND (" + DatabaseHelper.TASKS_COLUMN_DONE + " = " + history +
                         (isHistory ? " OR " : " AND ") + DatabaseHelper.TASKS_COLUMN_DELETED + " = " + history + ")",
                 null, null, null,
-                DatabaseHelper.TASKS_COLUMN_CYCLE + ", " + DatabaseHelper.COLUMN_ID + " DESC");
+                DatabaseHelper.TASKS_COLUMN_PRIORITY + " DESC");
         return getTasksFromCursor(cursor);
     }
 
diff --git a/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java b/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java
index 0f24efd..af78849 100644
--- a/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java
+++ b/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java
@@ -38,7 +38,6 @@ import com.wismna.geoffroy.donext.database.TaskDataAccess;
 import com.wismna.geoffroy.donext.database.TaskListDataAccess;
 import com.wismna.geoffroy.donext.helpers.TaskTouchHelper;
 import com.wismna.geoffroy.donext.listeners.RecyclerItemClickListener;
-import com.wismna.geoffroy.donext.widgets.NoScrollingLayoutManager;
 
 import org.joda.time.LocalDate;
 
@@ -104,7 +103,7 @@ public class TasksFragment extends Fragment implements
 
         // Set the Recycler view
         recyclerView = view.findViewById(R.id.task_list_view);
-        recyclerView.setLayoutManager(isHistory ? new LinearLayoutManager(context) : new NoScrollingLayoutManager(context));
+        recyclerView.setLayoutManager(new LinearLayoutManager(context));
 
         // Get all tasks
         try (TaskDataAccess taskDataAccess = new TaskDataAccess(view.getContext())) {
@@ -206,16 +205,6 @@ public class TasksFragment extends Fragment implements
                     totalTasksView.setText(resources.getQuantityString(R.plurals.task_total, totalTasks, totalTasks));
                 }
 
-                RecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager();
-                if (layoutManager instanceof LinearLayoutManager) return true;
-
-                // Update remaining tasks - only when needed
-                TextView remainingTasksView = view.findViewById(R.id.remaining_task_count);
-                NoScrollingLayoutManager noScrollingLayoutManager = (NoScrollingLayoutManager)layoutManager;
-                int remainingTaskCount = totalTasks - (noScrollingLayoutManager != null ? noScrollingLayoutManager.findLastVisibleItemPosition() : 1) - 1;
-                if (remainingTaskCount == 0) remainingTasksView.setText("");
-                else remainingTasksView.setText(resources.getQuantityString(R.plurals.task_remaining, remainingTaskCount, remainingTaskCount));
-
                 return true;
             }
         });
@@ -302,6 +291,7 @@ public class TasksFragment extends Fragment implements
             // Should never happen because we will have to be on this tab to open the dialog
             if (taskRecyclerViewAdapter == null) return;
 
+            int position = 0;
             // Add the task
             if (task == null) {
                 // If the new task is added to another task list, update the tab
@@ -310,13 +300,14 @@ public class TasksFragment extends Fragment implements
                 }
                 // Otherwise add it to the current one
                 else {
-                    taskRecyclerViewAdapter.add(newTask, 0);
-                    recyclerView.scrollToPosition(0);
+                    position = taskRecyclerViewAdapter.getItemCount();
+                    taskRecyclerViewAdapter.add(newTask, position);
+                    recyclerView.scrollToPosition(position);
                 }
             }
             // Update the task
             else {
-                int position = args != null ? args.getInt("position") : 0;
+                position = args != null ? args.getInt("position") : 0;
                 // Check if task list was changed
                 if ((isTodayView && !isToday) || (!isTodayView && task.getTaskListId() != taskList.getId()))
                 {
@@ -329,6 +320,7 @@ public class TasksFragment extends Fragment implements
                     taskRecyclerViewAdapter.update(newTask, position);
                 }
             }
+            taskRecyclerViewAdapter.notifyItemChanged(position);
         }
     }
 
diff --git a/app/src/main/res/layout/activity_history.xml b/app/src/main/res/layout/activity_history.xml
index c53dbe3..2181eaa 100644
--- a/app/src/main/res/layout/activity_history.xml
+++ b/app/src/main/res/layout/activity_history.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:id="@+id/main_content"
     tools:context="com.wismna.geoffroy.donext.activities.HistoryActivity">
     <fragment
         android:id="@+id/fragment_main"
diff --git a/app/src/main/res/layout/activity_today.xml b/app/src/main/res/layout/activity_today.xml
index fa7fd5b..115202d 100644
--- a/app/src/main/res/layout/activity_today.xml
+++ b/app/src/main/res/layout/activity_today.xml
@@ -2,6 +2,7 @@
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
diff --git a/app/src/main/res/layout/fragment_task_detailed.xml b/app/src/main/res/layout/fragment_task_detailed.xml
index a0b821b..eb22d2c 100644
--- a/app/src/main/res/layout/fragment_task_detailed.xml
+++ b/app/src/main/res/layout/fragment_task_detailed.xml
@@ -10,7 +10,8 @@
         android:id="@+id/task_cycle"
         android:layout_width="30dp"
         android:layout_height="wrap_content"
-        android:layout_margin="10dp"
+        android:layout_marginStart="10dp"
+        android:layout_gravity="center"
         android:textAppearance="?attr/textAppearanceListItem" />
     <TextView
         android:id="@+id/task_id"
@@ -23,6 +24,7 @@
         android:layout_height="wrap_content"
         android:paddingTop="10dp"
         android:layout_marginEnd="5dp"
+        android:layout_gravity="center"
         android:contentDescription="@string/task_alarm"/>
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_tasks.xml b/app/src/main/res/layout/fragment_tasks.xml
index 8bf512e..415f8e1 100644
--- a/app/src/main/res/layout/fragment_tasks.xml
+++ b/app/src/main/res/layout/fragment_tasks.xml
@@ -33,9 +33,9 @@
         android:id="@+id/task_list_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="70dp"
+        android:layout_marginBottom="40dp"
+        android:scrollbars="vertical"
         android:name="com.wismna.geoffroy.donext.activities.TaskFragment"
-        app:layoutManager="LinearLayoutManager"
         tools:context=".fragments.TasksFragment"
         tools:listitem="@layout/fragment_task_detailed" />
     <RelativeLayout
@@ -72,37 +72,25 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginBottom="70dp"
+        android:layout_marginBottom="40dp"
         android:layout_gravity="bottom"
         android:background="@color/colorPrimaryLight"/>
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="70dp"
+        android:layout_height="40dp"
         android:layout_gravity="bottom"
-        android:layout_marginTop="5dp"
-        android:paddingTop="15dp"
         android:orientation="horizontal"
         android:focusable="true"
         android:background="?android:attr/selectableItemBackground" >
         <TextView
             android:id="@+id/total_task_cycles"
             android:layout_width="100dp"
-            android:layout_marginStart="10dp"
+            android:layout_gravity="center"
+            android:layout_height="wrap_content"/>
+        <TextView
+            android:id="@+id/total_task_count"
+            android:layout_gravity="center"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:focusable="true"
-            android:background="?android:attr/selectableItemBackground" >
-            <TextView
-                android:id="@+id/total_task_count"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-            <TextView
-                android:id="@+id/remaining_task_count"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-        </LinearLayout>
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file