diff --git a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java
index 0433f72e0..780f6dc04 100644
--- a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java
@@ -58,12 +58,13 @@ public final class AlarmControlSet extends TaskEditControlSet {
     @Override
     protected void afterInflate() {
         this.alertsContainer = (LinearLayout) getView().findViewById(R.id.alert_container);
-        getView().findViewById(R.id.alarms_add).setOnClickListener(new View.OnClickListener() {
+        View.OnClickListener addAlarmListener = new View.OnClickListener() {
             @Override
             public void onClick(View arg0) {
                 addAlarm(new Date());
             }
-        });
+        };
+        getView().findViewById(R.id.alarms_add).setOnClickListener(addAlarmListener);
 
         pickerDialog = new DateAndTimeDialog(activity, 0);
     }
diff --git a/astrid/res/layout/control_set_alarms.xml b/astrid/res/layout/control_set_alarms.xml
index af5c387e0..0ece52938 100644
--- a/astrid/res/layout/control_set_alarms.xml
+++ b/astrid/res/layout/control_set_alarms.xml
@@ -12,24 +12,31 @@
   
     
     <TextView android:id="@+id/alarms_label"
+            android:layout_marginLeft="10dip"
+            android:layout_marginTop="10dip"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/alarm_ACS_label"
             style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
   <LinearLayout android:id="@+id/alert_container"
+      android:paddingLeft="5dip"
                 android:orientation="vertical"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content">
   </LinearLayout>
   
   <LinearLayout
+      android:id="@+id/alarms_add"
       android:layout_width="fill_parent"
-      android:layout_height="wrap_content">
-	  <Button android:id="@+id/alarms_add"
+      android:layout_height="wrap_content"
+      android:gravity="center_vertical">
+	  <TextView
 	          android:text="+"
-	          android:layout_width="50dip"
-	          android:layout_height="50dip"
-	          android:layout_marginTop="10dip"/>
+	          android:gravity="center"
+	          android:textSize="26sp"
+	          android:textColor="?attr/asThemeTextColor"
+	          android:layout_width="40dip"
+	          android:layout_height="40dip"/>
   	  <TextView
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/astrid/res/layout/control_set_collaborators.xml b/astrid/res/layout/control_set_collaborators.xml
index 26d2e4348..6c57ee762 100644
--- a/astrid/res/layout/control_set_collaborators.xml
+++ b/astrid/res/layout/control_set_collaborators.xml
@@ -18,7 +18,8 @@
 		<LinearLayout
 		  android:orientation="vertical"
 		  android:layout_width="fill_parent"
-		  android:layout_height="fill_parent">
+		  android:layout_height="fill_parent"
+		  android:layout_marginLeft="10dip">
 		      
 		      <!-- Shared with -->    
 		      <TextView
diff --git a/astrid/res/layout/control_set_reminders.xml b/astrid/res/layout/control_set_reminders.xml
index f66067d58..566e7105e 100644
--- a/astrid/res/layout/control_set_reminders.xml
+++ b/astrid/res/layout/control_set_reminders.xml
@@ -26,14 +26,16 @@
 		      <TextView
 		        android:layout_width="wrap_content"
 		        android:layout_height="wrap_content"
+		        android:paddingLeft="10dip"
 		        android:text="@string/TEA_reminder_label"
+		        android:paddingTop="10dip"
 		        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
 		      <CheckBox
 		        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" 
 		        android:id="@+id/reminder_due"
 		        android:layout_width="fill_parent"
 		        android:layout_height="wrap_content"
-		        android:layout_marginLeft="5dip"
+		        android:layout_marginLeft="10dip"
 		        android:button="@drawable/btn_check_small"       
 		        android:text="@string/TEA_reminder_due" />
 		      <CheckBox
@@ -41,7 +43,7 @@
 		        android:id="@+id/reminder_overdue"
 		        android:layout_width="fill_parent"
 		        android:layout_height="wrap_content"
-		        android:layout_marginLeft="5dip"
+		        android:layout_marginLeft="10dip"
 		        android:button="@drawable/btn_check_small"       
 		        android:text="@string/TEA_reminder_overdue" />
 		      <LinearLayout
@@ -53,7 +55,7 @@
 		          android:id="@+id/reminder_random"
 		          android:layout_width="wrap_content"
 		          android:layout_height="wrap_content"
-		          android:layout_marginLeft="5dip"
+		          android:layout_marginLeft="10dip"
 		          android:button="@drawable/btn_check_small"       
 		          android:text="@string/TEA_reminder_randomly" />
 		        <com.todoroo.astrid.ui.ErrorCatchingSpinner
@@ -70,6 +72,8 @@
 		          android:id="@+id/reminder_alarm_container"
 		          android:layout_width="fill_parent"
 		          android:layout_height="50dip"
+		          android:layout_marginLeft="10dip"
+		          android:layout_marginRight="10dip"
 		          android:gravity="center_vertical"
 		          android:orientation="horizontal">
 			      <TextView
diff --git a/astrid/res/layout/control_set_timers.xml b/astrid/res/layout/control_set_timers.xml
index 2a5aef589..e62b283f4 100644
--- a/astrid/res/layout/control_set_timers.xml
+++ b/astrid/res/layout/control_set_timers.xml
@@ -16,6 +16,8 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="50dip"
+        android:layout_marginLeft="10dip"
+        android:layout_marginRight="10dip"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 	    <TextView
@@ -41,6 +43,8 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="50dip"
+        android:layout_marginLeft="10dip"
+        android:layout_marginRight="10dip"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 	    <TextView
diff --git a/astrid/res/values/strings-actfm.xml b/astrid/res/values/strings-actfm.xml
index ed75a2ce3..fd91fad61 100644
--- a/astrid/res/values/strings-actfm.xml
+++ b/astrid/res/values/strings-actfm.xml
@@ -166,7 +166,7 @@
   <string name="actfm_EPA_share_with">Share with:</string>
   
   <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_collaborators_header">Share with Friends</string>
+  <string name="actfm_EPA_collaborators_header">Share</string>
 
       <!-- task sharing dialog: collaborator list name (%s => name of list) -->
   <string name="actfm_EPA_list">List: %s</string>
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 3979b5799..fb9113c08 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -131,7 +131,7 @@
   <!-- Menu: Tutorial -->
 
   <!-- Menu: Settings -->    
-  <string name="TLA_menu_settings">Account &amp; Settings</string>
+  <string name="TLA_menu_settings">Settings</string>
   
   <!-- slide 30b: Menu: Support -->
   <string name="TLA_menu_support">Support</string>
@@ -348,7 +348,7 @@
   <string name="TEA_estimatedDuration_label">How long will it take?</string>
   
   <!-- Elapsed time label -->
-  <string name="TEA_elapsedDuration_label">Time already spent on task</string>
+  <string name="TEA_elapsedDuration_label">Time already spent</string>
 
   <!-- Menu: Save -->    
   <string name="TEA_menu_save">Save Changes</string>
diff --git a/astrid/res/values/strings-reminders.xml b/astrid/res/values/strings-reminders.xml
index 62051dbe8..dff01c99b 100644
--- a/astrid/res/values/strings-reminders.xml
+++ b/astrid/res/values/strings-reminders.xml
@@ -14,7 +14,7 @@
   <string name="TEA_reminders_group_label">Reminders</string>
 
   <!-- Task Edit: Reminder header label -->  
-  <string name="TEA_reminder_label">Remind me:</string>
+  <string name="TEA_reminder_label">Remind me</string>
 
   <!-- Task Edit: Reminder @ deadline -->  
   <string name="TEA_reminder_due">When task is due</string>
@@ -26,16 +26,16 @@
   <string name="TEA_reminder_randomly">Randomly once</string>
 
   <!-- Task Edit: Reminder alarm clock label -->  
-  <string name="TEA_reminder_alarm_label">Ring/vibrate type:</string>
+  <string name="TEA_reminder_alarm_label">Ring/vibrate type</string>
 
   <!--  slide 45a: Task Edit: Reminder mode: ring once -->  
-  <string name="TEA_reminder_mode_once">Ring once</string>
+  <string name="TEA_reminder_mode_once">Once</string>
 
   <!-- slide 45b: Task Edit: Reminder mode: ring five times -->  
-  <string name="TEA_reminder_mode_five">Ring five times</string>
+  <string name="TEA_reminder_mode_five">Five times</string>
 
   <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->  
-  <string name="TEA_reminder_mode_nonstop">Ring until I dismiss alarm</string>
+  <string name="TEA_reminder_mode_nonstop">Until I dismiss alarm</string>
 
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
diff --git a/astrid/res/values/strings-timers.xml b/astrid/res/values/strings-timers.xml
index 512dfe5a9..0151348eb 100644
--- a/astrid/res/values/strings-timers.xml
+++ b/astrid/res/values/strings-timers.xml
@@ -21,7 +21,7 @@
     <string name="TFE_workingOn">Tasks Being Timed</string>
     
     <!-- Title for TEA -->
-    <string name="TEA_timer_controls">Timer Controls</string>
+    <string name="TEA_timer_controls">Timer</string>
     
     
     <!-- Edit Notes: create comment for when timer is started -->
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 7f1c2139a..5321f987f 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -264,8 +264,8 @@
     
     <!-- generic style for labels above edit boxes -->
     <style name="TextAppearance.GEN_EditLabel">
-        <item name="android:textSize">15sp</item>
-        <item name="android:textStyle">bold</item>
+        <!-- <item name="android:textSize">15sp</item>
+        <item name="android:textStyle">bold</item> -->
     </style>
     
    	<style name="TextAppearance.ActionBar_ListsHeader">
diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
index 715afd842..33326a116 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -264,6 +264,10 @@ public final class UpgradeService {
                 Preferences.setString(R.string.p_taskRowStyle_v2, value ? "1" : "0"); //$NON-NLS-1$ //$NON-NLS-2$
             }
         }
+
+        if (from < V4_5_1_1) {
+            Preferences.setBoolean(R.string.p_simple_input_boxes, true);
+        }
     }
 
     /**
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
index b41a4841e..e27b391e4 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
@@ -121,7 +121,7 @@ public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec {
 
         setPreference(prefs, editor, r, R.string.p_use_filters, true, ifUnset);
 
-        setPreference(prefs, editor, r, R.string.p_simple_input_boxes, false, ifUnset);
+        setPreference(prefs, editor, r, R.string.p_simple_input_boxes, true, ifUnset);
 
         setPreference(prefs, editor, r, R.string.p_show_list_members, true, ifUnset);
         setPreference(prefs, editor, r, R.string.p_rmd_social, true, ifUnset);