diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
index 61c53e764..3fcfffb7e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
@@ -21,6 +21,7 @@ import android.graphics.Color;
 import android.support.v4.app.Fragment;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -114,6 +115,7 @@ public class EditPeopleControlSet extends PopupControlSet {
     public interface AssignedChangedListener {
         public boolean showTaskRabbitForUser(String name, JSONObject json);
         public boolean shouldShowTaskRabbit();
+        public boolean didPostToTaskRabbit();
     }
 
     int selected = 0; //need to remember last selected state for task rabbit
@@ -389,6 +391,9 @@ public class EditPeopleControlSet extends PopupControlSet {
             if (l.shouldShowTaskRabbit()) {
                 taskRabbitUser = new AssignedToUser(activity.getString(R.string.actfm_EPA_task_rabbit), new JSONObject().put("default_picture", R.drawable.task_rabbit_image));
                 listValues.add(taskRabbitUser);
+                if(l.didPostToTaskRabbit() && assignedIndex <= 0){
+                    assignedIndex = listValues.size()-1;
+                }
             }
         }
 
@@ -457,8 +462,10 @@ public class EditPeopleControlSet extends PopupControlSet {
 
                 for (AssignedChangedListener l : listeners) {
                     if(l.showTaskRabbitForUser(user.label, user.user)) {
-                        assignedList.setItemChecked(selected, true);
-                        assignedList.setItemChecked(position, false);
+//                        assignedList.setItemChecked(selected, true);
+//                        assignedList.setItemChecked(position, false);
+                        assignedDisplay.setText(user.toString());
+                        assignedCustom.setText(""); //$NON-NLS-1$
                         DialogUtilities.dismissDialog(activity, dialog);
                         return;
                     }
@@ -529,8 +536,17 @@ public class EditPeopleControlSet extends PopupControlSet {
                 assignedView = assignedCustom;
             } else {
                 AssignedToUser item = (AssignedToUser) assignedList.getAdapter().getItem(assignedList.getCheckedItemPosition());
-                if (item != null)
+                if (item != null) {
+                    if (item.equals(taskRabbitUser)) { //don't want to ever set the user as the task rabbit user
+                        Log.d("Edit People control set", "Equals task rabbit");
+                        item = (AssignedToUser) assignedList.getAdapter().getItem(0);
+                        selected = 0;
+                    }
+                    else {
+                        Log.d("Edit People control set", "Does not equal task rabbit");
+                    }
                     userJson = item.user;
+                }
             }
 
             if (userJson != null) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java
index 3b2ce4c77..a6ec49d3b 100644
--- a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java
@@ -274,6 +274,7 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
             int arrayID = arrayType.getResourceId(i, 0);
             if (arrayID == R.string.tr_set_key_location) {
                 TaskRabbitLocationControlSet set = new TaskRabbitLocationControlSet(this, R.layout.task_rabbit_row, titleID, i);
+                set.location = currentLocation;
                 controls.add(set);
             }
             else if(arrayID == R.string.tr_set_key_deadline) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java
index c54df1ee1..131fa1b5e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java
@@ -201,8 +201,7 @@ public class TaskRabbitControlSet extends TaskEditControlSet implements Assigned
 
 
     private String taskRabbitURL(String method) {
-        return TaskRabbitActivity.TASK_RABBIT_URL + "/api/v1/"+ method;
-
+        return String.format("%S/api/v1/%S?client_id=%S&client_application=%S", TaskRabbitActivity.TASK_RABBIT_URL, method, TaskRabbitActivity.TASK_RABBIT_CLIENT_ID, TaskRabbitActivity.TASK_RABBIT_CLIENT_APPLICATION_ID);
     }
 
     /** Fire task rabbit if assigned **/
@@ -358,4 +357,15 @@ public class TaskRabbitControlSet extends TaskEditControlSet implements Assigned
         // TODO Auto-generated method stub
 
     }
+
+
+
+
+    @Override
+    public boolean didPostToTaskRabbit() {
+        if (taskRabbitTask == null) return false;
+        return taskRabbitTask.getTaskID() > 0;
+    }
+
+
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitLocationControlSet.java b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitLocationControlSet.java
index 149b395d7..52b40c2cd 100644
--- a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitLocationControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitLocationControlSet.java
@@ -30,7 +30,7 @@ public class TaskRabbitLocationControlSet extends TaskEditControlSet implements
     private final TextView displayText;
     private final TextView displayEdit;
     private final Activity activity;
-    private Location location;
+    public Location location;
     private String locationName;
 
     public int REQUEST_CODE_TASK_RABBIT_LOCATION = 6;
@@ -133,7 +133,7 @@ public class TaskRabbitLocationControlSet extends TaskEditControlSet implements
     }
 
     public void updateCurrentLocation(Location currentLocation) {
-        if (location != null) {
+        if (location == null) {
             location = currentLocation;
         }
     }
diff --git a/astrid/res/drawable/task_rabbit_logo.jpg b/astrid/res/drawable/task_rabbit_logo.jpg
deleted file mode 100644
index d7e195049..000000000
Binary files a/astrid/res/drawable/task_rabbit_logo.jpg and /dev/null differ
diff --git a/astrid/res/drawable/task_rabbit_logo.png b/astrid/res/drawable/task_rabbit_logo.png
new file mode 100644
index 000000000..f0cb47462
Binary files /dev/null and b/astrid/res/drawable/task_rabbit_logo.png differ
diff --git a/astrid/res/layout/task_rabbit_map_activity.xml b/astrid/res/layout/task_rabbit_map_activity.xml
index 744925d10..20f594d06 100644
--- a/astrid/res/layout/task_rabbit_map_activity.xml
+++ b/astrid/res/layout/task_rabbit_map_activity.xml
@@ -22,8 +22,9 @@
         <EditText
             android:id="@+id/search_text"
             android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="10"
+            android:minHeight="50dip"
             android:hint="Enter address"/>
 
         <ImageButton
diff --git a/astrid/res/layout/task_rabbit_menu_popover.xml b/astrid/res/layout/task_rabbit_menu_popover.xml
index 9ac60b81e..386a60e24 100644
--- a/astrid/res/layout/task_rabbit_menu_popover.xml
+++ b/astrid/res/layout/task_rabbit_menu_popover.xml
@@ -9,7 +9,7 @@
         android:id="@+id/content"
         android:layout_width="280dip"
         android:layout_height="wrap_content"
-        android:background="@drawable/list_popover_bg"
+    android:background="?attr/asListPopoverBg"
         android:layout_below="@+id/gdi_arrow_up"/>
 
     <ImageView
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
index dc2960364..10d6a13f0 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -509,20 +509,21 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
         // EditPeopleControlSet relies on the "tags" transitory created by the
         // TagsControlSet, so we put the tags control before the people control
+        // EditPeopleControlSet also relies on taskRabbitControl set being added
+        // that way it can tell if it needs to show task rabbit in the spinner
 
-
-        controls.add(peopleControlSet = new EditPeopleControlSet(getActivity(), this,
+        peopleControlSet = new EditPeopleControlSet(getActivity(), this,
                 R.layout.control_set_assigned,
                 R.layout.control_set_default_display,
-                R.string.actfm_EPA_assign_label_long, REQUEST_LOG_IN));
-        controlSetMap.put(getString(R.string.TEA_ctrl_who_pref),
-                peopleControlSet);
-
+                R.string.actfm_EPA_assign_label_long, REQUEST_LOG_IN);
         if(Locale.getDefault().getCountry().equals("US")) {
         taskRabbitControl = new TaskRabbitControlSet(this, R.layout.control_set_default_display);
         controls.add(taskRabbitControl);
         peopleControlSet.addListener(taskRabbitControl);
         }
+        controls.add(peopleControlSet);
+        controlSetMap.put(getString(R.string.TEA_ctrl_who_pref),
+                peopleControlSet);
 
         RepeatControlSet repeatControls = new RepeatControlSet(getActivity(),
                 R.layout.control_set_repeat,
diff --git a/astrid/src/com/todoroo/astrid/ui/WebServicesView.java b/astrid/src/com/todoroo/astrid/ui/WebServicesView.java
index bde7eb75d..f58b7e5c0 100644
--- a/astrid/src/com/todoroo/astrid/ui/WebServicesView.java
+++ b/astrid/src/com/todoroo/astrid/ui/WebServicesView.java
@@ -30,6 +30,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.HorizontalScrollView;
 import android.widget.ImageView;
+import android.widget.ImageView.ScaleType;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -407,18 +408,19 @@ public class WebServicesView extends LinearLayout {
     protected void initializeTaskRabbit() {
 
         if(taskRabbitControl != null && taskRabbitControl.isEnabledForTRLocation == true) {
-        addSectionHeader("Task Rabbit");
+        addSectionHeader("Outsource this task to someone");
 
         final LinearLayout body = new LinearLayout(activity);
         body.setLayoutParams(new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT,
-                    LayoutParams.WRAP_CONTENT));
+                    ROW_HEIGHT));
         body.setOrientation(LinearLayout.VERTICAL);
 
 
         ImageView imageView = new ImageView(getContext());
         imageView.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT,
-                LayoutParams.WRAP_CONTENT));
+                ROW_HEIGHT));
         imageView.setImageResource(R.drawable.task_rabbit_logo);
+        imageView.setScaleType(ScaleType.CENTER_INSIDE);
         body.addView(imageView);
 
         body.setOnClickListener(new OnClickListener() {
@@ -433,8 +435,6 @@ public class WebServicesView extends LinearLayout {
         addSectionDivider();
 
         }
-        else {
-        }
 
     }