diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 852c1bcbe..1bfa96778 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -9,7 +9,7 @@
 
     <uses-sdk
         android:minSdkVersion="15"
-        android:targetSdkVersion="23" />
+        android:targetSdkVersion="24" />
 
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 4f269d6fd..108e33313 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -116,7 +116,6 @@ dependencies {
     //RxJava
     compile 'io.reactivex:rxandroid:1.2.0'
     compile 'io.reactivex:rxjava:1.1.5'
-    compile 'com.trello:rxlifecycle:0.6.1'
 
     //Analytics
     compile 'com.amplitude:android-sdk:2.7.1'
diff --git a/Habitica/res/layout/activity_task_form.xml b/Habitica/res/layout/activity_task_form.xml
index 507353a58..45b11e69e 100644
--- a/Habitica/res/layout/activity_task_form.xml
+++ b/Habitica/res/layout/activity_task_form.xml
@@ -149,53 +149,22 @@
                 android:text="@string/actions"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
 
-                <TextView
-                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_centerVertical="true"
-                    android:layout_marginTop="11dp"
-                    android:layout_toLeftOf="@+id/task_positive_checkbox"
-                    android:text="@string/positive_habit_form"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                <CheckBox
+            <CheckBox
                     android:id="@+id/task_positive_checkbox"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:layout_marginTop="0dp" />
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_centerVertical="true"
-                    android:layout_marginTop="11dp"
-                    android:layout_toLeftOf="@+id/task_negative_checkbox"
-                    android:text="@string/negative_habit_form"
+                    android:layout_marginBottom="11dp"
+                    android:text="@string/positive_habit_form"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
 
                 <CheckBox
                     android:id="@+id/task_negative_checkbox"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:layout_marginTop="0dp" />
-            </RelativeLayout>
+                    android:layout_marginBottom="11dp"
+                    android:text="@string/negative_habit_form"
+                    android:textAppearance="?android:attr/textAppearanceMedium" />
 
         </LinearLayout>