diff --git a/res/layout/task_view.xml b/res/layout/task_view.xml
index 92787e0e4..39cea8045 100644
--- a/res/layout/task_view.xml
+++ b/res/layout/task_view.xml
@@ -56,6 +56,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
         </LinearLayout>
+        
+                <!-- Notes -->
 
         <!-- Elapsed Time -->
         <LinearLayout 
@@ -103,7 +105,6 @@
                 android:colorForeground="@color/view_table_values" />
         </LinearLayout>
         
-        <!-- Absolute Deadline -->
         <LinearLayout 
             android:orientation="vertical"
             android:layout_width="fill_parent"
@@ -113,64 +114,66 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:padding="5px"
-                android:src="@android:drawable/divider_horizontal_bright" />
+                android:src="@android:drawable/divider_horizontal_bright" />   
+            
             <TextView
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="5px"
-                android:text="@string/taskView_definiteDueDate"
+                android:text="@string/taskView_notes"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
-            <TextView android:id="@+id/cell_definiteDueDate"
+            
+            <TextView android:id="@+id/cell_notes"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="5px"
                 android:textAppearance="?android:attr/textAppearanceSmall"
-                android:colorForeground="@color/view_table_values" />
+                android:colorForeground="@color/view_table_values" /> 
         </LinearLayout>
         
-        <!-- Goal Deadline -->
+        <!-- Absolute Deadline -->
         <LinearLayout 
             android:orientation="vertical"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content">
-
+            
             <ImageView
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:padding="5px"
-                android:src="@android:drawable/divider_horizontal_bright" />            
+                android:src="@android:drawable/divider_horizontal_bright" />
             <TextView
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="5px"
-                android:text="@string/taskView_preferredDueDate"
+                android:text="@string/taskView_definiteDueDate"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
-            <TextView android:id="@+id/cell_preferredDueDate"
+            <TextView android:id="@+id/cell_definiteDueDate"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="5px"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:colorForeground="@color/view_table_values" />
         </LinearLayout>
-
-        <!-- Creation Date -->
+        
+        <!-- Goal Deadline -->
         <LinearLayout 
             android:orientation="vertical"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content">
-            
+
             <ImageView
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:padding="5px"
-                android:src="@android:drawable/divider_horizontal_bright" />
+                android:src="@android:drawable/divider_horizontal_bright" />            
             <TextView
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="5px"
-                android:text="@string/taskView_creationDate"
+                android:text="@string/taskView_preferredDueDate"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
-            <TextView android:id="@+id/cell_creationDate"
+            <TextView android:id="@+id/cell_preferredDueDate"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="5px"
@@ -178,7 +181,7 @@
                 android:colorForeground="@color/view_table_values" />
         </LinearLayout>
 
-        <!-- Notes -->
+        <!-- Creation Date -->
         <LinearLayout 
             android:orientation="vertical"
             android:layout_width="fill_parent"
@@ -188,21 +191,19 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:padding="5px"
-                android:src="@android:drawable/divider_horizontal_bright" />   
-            
+                android:src="@android:drawable/divider_horizontal_bright" />
             <TextView
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="5px"
-                android:text="@string/taskView_notes"
+                android:text="@string/taskView_creationDate"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
-            
-            <TextView android:id="@+id/cell_notes"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="5px"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:colorForeground="@color/view_table_values" /> 
+            <TextView android:id="@+id/cell_creationDate"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="5px"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:colorForeground="@color/view_table_values" />
         </LinearLayout>
         
        <ImageView