diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index e5ca88c42..26679768f 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -151,7 +151,7 @@
         
     <!-- core -->
     <receiver android:name="com.todoroo.astrid.core.CorePlugin">
-      <intent-filter>
+      <intent-filter android:priority="9000" >
         <action android:name="com.todoroo.astrid.REQUEST_ADDONS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
@@ -223,7 +223,7 @@
       </intent-filter>
     </receiver>
     <receiver android:name="com.todoroo.astrid.timers.TimerFilterExposer">
-      <intent-filter>
+      <intent-filter android:priority="10000">
         <action android:name="com.todoroo.astrid.REQUEST_FILTERS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
diff --git a/astrid/res/layout/timer_decoration.xml b/astrid/res/layout/timer_decoration.xml
index 1f568e9c0..449a2707c 100644
--- a/astrid/res/layout/timer_decoration.xml
+++ b/astrid/res/layout/timer_decoration.xml
@@ -7,19 +7,19 @@
     android:paddingLeft="3px">
     
     <ImageView
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:layout_weight="3"
-      android:gravity="bottom|center"
-      android:scaleType="center"
-      android:src="@drawable/timers_decoration" />
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="5"
+        android:gravity="bottom|center_horizontal"
+        android:scaleType="center"
+        android:src="@drawable/timers_decoration" />
       
     <Chronometer android:id="@+id/timer"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:gravity="top|center"
-      android:textSize="10sp" />
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="2"
+        android:gravity="top"
+        android:textSize="10sp" />
         
 </LinearLayout>
 
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index 05e782e75..16d54d356 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -575,7 +575,9 @@ public class TaskAdapter extends CursorAdapter {
             } else {
                 expanded = taskId;
             }
-            notifyDataSetInvalidated();
+            notifyDataSetChanged();
+            ListView listView = activity.getListView();
+            listView.setSelection(listView.indexOfChild(viewHolder.view));
         }
     }