diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index d063b72e0..1c581f69c 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -27,7 +27,7 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
-            android:windowSoftInputMode="stateHidden|adjustResize">
+            android:windowSoftInputMode="stateHidden|adjustResize">:D
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -69,12 +69,6 @@
             android:name="io.fabric.ApiKey"
             android:value="2eb3b3edb3b0f4722d37d649a5af366656e46ddd" />
 
-        <activity
-            android:name=".MainActivityNew"
-            android:label="@string/app_name"
-            android:windowSoftInputMode="stateHidden|adjustResize"
-            android:theme="@style/CustomTheme" />
-
         <activity android:name=".AboutActivity" />
     </application>
 
diff --git a/Habitica/Habitica.iml b/Habitica/Habitica.iml
index e2b87b51c..7c48a3086 100644
--- a/Habitica/Habitica.iml
+++ b/Habitica/Habitica.iml
@@ -108,52 +108,52 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="design-22.2.0" level="project" />
-    <orderEntry type="library" exported="" name="aboutlibraries-5.0.5" level="project" />
-    <orderEntry type="library" exported="" name="instabugsupport-1.4" level="project" />
-    <orderEntry type="library" exported="" name="kotlin-runtime-0.11.91" level="project" />
-    <orderEntry type="library" exported="" name="org.abego.treelayout.core-1.0.1" level="project" />
-    <orderEntry type="library" exported="" name="library-2.1.4" level="project" />
-    <orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
-    <orderEntry type="library" exported="" name="paperboy-0d4e14bbb5" level="project" />
-    <orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
-    <orderEntry type="library" exported="" name="retrofit-1.6.0" level="project" />
-    <orderEntry type="library" exported="" name="kenburnsview-1.0.6" level="project" />
-    <orderEntry type="library" exported="" name="library-1.0.16" level="project" />
-    <orderEntry type="library" exported="" name="adapters-1.0-rc0" level="project" />
-    <orderEntry type="library" exported="" name="mimecraft-1.1.1" level="project" />
-    <orderEntry type="library" exported="" name="antlr4-runtime-4.4" level="project" />
-    <orderEntry type="library" exported="" name="antlr4-annotations-4.4" level="project" />
-    <orderEntry type="library" exported="" name="materialviewpager-1.0.5" level="project" />
-    <orderEntry type="library" exported="" name="fabric-1.3.1" level="project" />
-    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
-    <orderEntry type="library" exported="" name="android-observablescrollview-1.5.2" level="project" />
-    <orderEntry type="library" exported="" name="antlr4-4.4" level="project" />
     <orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
-    <orderEntry type="library" exported="" name="crashlytics-core-2.3.0" level="project" />
-    <orderEntry type="library" exported="" name="antlr-runtime-3.5.2" level="project" />
-    <orderEntry type="library" exported="" name="materialdrawer-3.0.8" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
-    <orderEntry type="library" exported="" name="gridlayout-v7-22.2.0" level="project" />
-    <orderEntry type="library" exported="" name="kotlin-stdlib-0.11.91" level="project" />
-    <orderEntry type="library" exported="" name="recyclerview-v7-22.2.0" level="project" />
-    <orderEntry type="library" exported="" name="cardview-v7-22.2.0" level="project" />
-    <orderEntry type="library" exported="" name="baseLibrary-1.0-rc0" level="project" />
-    <orderEntry type="library" exported="" name="butterknife-6.1.0" level="project" />
-    <orderEntry type="library" exported="" name="commons-lang3-3.3.2" level="project" />
-    <orderEntry type="library" exported="" name="beta-1.1.2" level="project" />
-    <orderEntry type="library" exported="" name="crouton-1.8.1" level="project" />
-    <orderEntry type="library" exported="" name="iconics-1.1.0" level="project" />
-    <orderEntry type="library" exported="" name="guava-17.0" level="project" />
-    <orderEntry type="library" exported="" name="instabugcore-1.4" level="project" />
-    <orderEntry type="library" exported="" name="library-1.1.0" level="project" />
     <orderEntry type="library" exported="" name="answers-1.2.0" level="project" />
-    <orderEntry type="library" exported="" name="commons-codec-1.10" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
-    <orderEntry type="library" exported="" name="compiler-1.0-rc0" level="project" />
-    <orderEntry type="library" exported="" name="library-1.0-rc0" level="project" />
-    <orderEntry type="library" exported="" name="crashlytics-2.3.0" level="project" />
-    <orderEntry type="library" exported="" name="ST4-4.0.8" level="project" />
+    <orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
+    <orderEntry type="library" exported="" name="recyclerview-v7-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
+    <orderEntry type="library" exported="" name="library-1.0.16" level="project" />
+    <orderEntry type="library" exported="" name="kenburnsview-1.0.6" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="retrofit-1.6.0" level="project" />
+    <orderEntry type="library" exported="" name="paperboy-0d4e14bbb5" level="project" />
+    <orderEntry type="library" exported="" name="antlr4-4.4" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="materialdrawer-3.0.8" level="project" />
+    <orderEntry type="library" exported="" name="crashlytics-core-2.3.0" level="project" />
+    <orderEntry type="library" exported="" name="aboutlibraries-5.0.5" level="project" />
+    <orderEntry type="library" exported="" name="library-1.0-rc0" level="project" />
+    <orderEntry type="library" exported="" name="instabugsupport-1.4" level="project" />
+    <orderEntry type="library" exported="" name="antlr-runtime-3.5.2" level="project" />
+    <orderEntry type="library" exported="" name="antlr4-annotations-4.4" level="project" />
+    <orderEntry type="library" exported="" name="butterknife-6.1.0" level="project" />
+    <orderEntry type="library" exported="" name="org.abego.treelayout.core-1.0.1" level="project" />
+    <orderEntry type="library" exported="" name="library-1.1.0" level="project" />
+    <orderEntry type="library" exported="" name="adapters-1.0-rc0" level="project" />
+    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
+    <orderEntry type="library" exported="" name="mimecraft-1.1.1" level="project" />
+    <orderEntry type="library" exported="" name="library-2.1.4" level="project" />
+    <orderEntry type="library" exported="" name="iconics-1.1.0" level="project" />
+    <orderEntry type="library" exported="" name="instabugcore-1.4" level="project" />
+    <orderEntry type="library" exported="" name="android-observablescrollview-1.5.2" level="project" />
+    <orderEntry type="library" exported="" name="kotlin-stdlib-0.11.91" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="crouton-1.8.1" level="project" />
+    <orderEntry type="library" exported="" name="antlr4-runtime-4.4" level="project" />
+    <orderEntry type="library" exported="" name="guava-17.0" level="project" />
+    <orderEntry type="library" exported="" name="crashlytics-2.3.0" level="project" />
+    <orderEntry type="library" exported="" name="materialviewpager-1.0.5" level="project" />
+    <orderEntry type="library" exported="" name="baseLibrary-1.0-rc0" level="project" />
+    <orderEntry type="library" exported="" name="fabric-1.3.1" level="project" />
+    <orderEntry type="library" exported="" name="compiler-1.0-rc0" level="project" />
+    <orderEntry type="library" exported="" name="beta-1.1.2" level="project" />
+    <orderEntry type="library" exported="" name="gridlayout-v7-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="ST4-4.0.8" level="project" />
+    <orderEntry type="library" exported="" name="commons-codec-1.10" level="project" />
+    <orderEntry type="library" exported="" name="commons-lang3-3.3.2" level="project" />
+    <orderEntry type="library" exported="" name="kotlin-runtime-0.11.91" level="project" />
+    <orderEntry type="library" exported="" name="design-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="cardview-v7-22.2.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/Habitica/res/layout-land/activity_main.xml b/Habitica/res/layout-land/activity_main.xml
deleted file mode 100644
index ff2392f07..000000000
--- a/Habitica/res/layout-land/activity_main.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-
-    tools:context=".MainActivity" >
-
-	<LinearLayout
-	    android:layout_width="0dip"
-	    android:layout_height="wrap_content"
-	    android:layout_weight="0.5"
-	    android:layout_gravity="bottom"
-	    android:orientation="vertical"
-	    android:paddingRight="8dip"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-	    android:layout_marginBottom="0dip"
-	    android:layout_marginTop="@dimen/activity_vertical_margin"
-	    >
-
-		<include layout="@layout/avatar_with_bars"
-			android:id="@+id/avatar_with_bars"
-
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:layout_marginTop="16dp"
-			android:gravity="center"
-			android:orientation="vertical"
-			android:paddingTop="@dimen/bar_padding"
-			android:paddingBottom="@dimen/bar_padding"/>
-
-
-		<ProgressBar
-				android:id="@+id/PB_AsyncTask"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				style="@style/Widget.ProgressBar.Horizontal"
-				android:indeterminate="true"
-				android:layout_marginBottom="@dimen/PB_marginBottom"
-				/>
-
-		<RelativeLayout
-				android:id="@+id/RL_addTask"
-				android:layout_width="match_parent"
-				android:layout_height="@dimen/new_task_bar_size"
-				android:layout_gravity="end"
-				android:background="@drawable/bottom_bar_bg"
-				android:gravity="bottom"
-				android:orientation="horizontal"
-				android:paddingBottom="0dp" >
-			<ImageButton
-					android:id="@+id/BT_task_new"
-					android:layout_width="@dimen/new_task_bat_btn_width"
-					android:layout_height="match_parent"
-					android:layout_gravity="top"
-					android:background="@drawable/selectable_background_cardbank"
-					android:padding="@dimen/new_task_bat_btn_padding"
-					android:src="@drawable/ic_menu_send"
-					android:layout_alignParentRight="true"
-					android:scaleType="fitCenter"/>
-			<ImageButton
-					android:id="@+id/BT_editTask"
-					android:layout_width="@dimen/new_task_bat_btn_width"
-					android:layout_height="match_parent"
-					android:padding="@dimen/new_task_bat_btn_padding"
-					android:background="@drawable/selectable_background_cardbank"
-					android:src="@drawable/ic_menu_edit"
-					android:layout_toLeftOf="@id/BT_task_new"
-					android:scaleType="fitCenter"/>
-			<EditText
-					android:id="@+id/ET_addTask"
-					android:layout_width="match_parent"
-					android:layout_height="match_parent"
-					android:hint="@string/create_habit_hint"
-					android:imeOptions="actionDone"
-					android:inputType="textCapSentences|textNoSuggestions"
-					android:layout_toLeftOf="@id/BT_editTask">
-				<!--	android:textColor="@color/white"
-					android:textColorHint="#FFC0C0C0"
-				 -->
-			</EditText>
-		</RelativeLayout>
-	</LinearLayout>
-
-	<android.support.v4.view.ViewPager
-	    android:id="@+id/home_pannels_pager"
-	    android:layout_width="0dip"
-	    android:layout_weight="0.5"
-	    android:layout_height="wrap_content"
-	    android:background="@android:color/transparent" 
-	    android:paddingLeft="8dip"
-		android:layout_marginBottom="@dimen/activity_vertical_margin"
-	    android:layout_marginRight="@dimen/activity_horizontal_margin"
-	    >
-	</android.support.v4.view.ViewPager>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml
deleted file mode 100644
index 38a7afd1f..000000000
--- a/Habitica/res/layout/activity_main.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="0dip"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".MainActivity">
-
-    <include layout="@layout/avatar_with_bars"
-        android:id="@+id/avatar_with_bars"
-        android:layout_width="match_parent"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:layout_height="wrap_content"/>
-
-    <android.support.v4.view.ViewPager
-        android:id="@+id/home_pannels_pager"
-        android:layout_width="wrap_content"
-        android:layout_height="0dip"
-        android:layout_weight="0.9"
-        android:background="@android:color/transparent" />
-
-    <ProgressBar
-        android:id="@+id/PB_AsyncTask"
-        style="@style/Widget.ProgressBar.Horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/PB_marginBottom"
-        android:indeterminate="true" />
-
-    <RelativeLayout
-        android:id="@+id/RL_addTask"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/new_task_bar_size"
-        android:layout_gravity="end"
-        android:background="@drawable/bottom_bar_bg"
-        android:gravity="bottom"
-        android:orientation="horizontal"
-        android:paddingBottom="0dp">
-
-        <ImageButton
-            android:id="@+id/BT_task_new"
-            android:layout_width="@dimen/new_task_bat_btn_width"
-            android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
-            android:layout_gravity="top"
-            android:background="@drawable/selectable_background_cardbank"
-            android:padding="@dimen/new_task_bat_btn_padding"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_menu_send" />
-
-        <ImageButton
-            android:id="@+id/BT_editTask"
-            android:layout_width="@dimen/new_task_bat_btn_width"
-            android:layout_height="match_parent"
-            android:layout_toLeftOf="@id/BT_task_new"
-            android:background="@drawable/selectable_background_cardbank"
-            android:padding="@dimen/new_task_bat_btn_padding"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_menu_edit" />
-
-        <EditText
-            android:id="@+id/ET_addTask"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_toLeftOf="@id/BT_editTask"
-            android:hint="@string/create_habit_hint"
-            android:imeOptions="actionDone"
-            android:inputType="textCapSentences|textNoSuggestions">
-            <!--	android:textColor="@color/white"
-                android:textColorHint="#FFC0C0C0"
-             -->
-        </EditText>
-    </RelativeLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_main_new.xml b/Habitica/res/layout/activity_main_new.xml
index 186019563..9439b1e26 100644
--- a/Habitica/res/layout/activity_main_new.xml
+++ b/Habitica/res/layout/activity_main_new.xml
@@ -13,7 +13,7 @@
         android:layout_height="match_parent"
         app:viewpager_logoMarginTop="70dp"
         app:viewpager_pagerTitleStrip="@layout/material_view_pager_pagertitlestrip_standard"
-        app:viewpager_color="@color/colorPrimary"
+        app:viewpager_color="@color/brand"
         app:viewpager_headerHeight="220dp"
         app:viewpager_headerAlpha="1"
         app:viewpager_logo="@layout/avatar_with_bars"
diff --git a/Habitica/res/layout/fragment_recyclerview.xml b/Habitica/res/layout/fragment_recyclerview.xml
index 918c23be5..6fe21cac3 100644
--- a/Habitica/res/layout/fragment_recyclerview.xml
+++ b/Habitica/res/layout/fragment_recyclerview.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout
+    android:id="@+id/coordinatorLayout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".FABActivity">
+<RelativeLayout
+    android:id="@+id/relativeLayoutView"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -12,14 +20,18 @@
         android:scrollbarSize="3dp"
         android:scrollbarThumbVertical="@color/md_grey_500"
         android:scrollbars="vertical"/>
+</RelativeLayout>
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignBottom="@id/recyclerView"
-        android:layout_marginBottom="32dp"
-        android:layout_marginRight="20dp"/>
+        android:layout_marginBottom="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        app:fabSize="normal"
+        app:layout_anchor="@id/coordinatorLayout"
+        app:layout_anchorGravity="bottom|right|end"
+        app:backgroundTint="@color/brand"/>
 
-</RelativeLayout>
\ No newline at end of file
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/main_with_drawer.xml b/Habitica/res/layout/main_with_drawer.xml
deleted file mode 100644
index 0662abf28..000000000
--- a/Habitica/res/layout/main_with_drawer.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		android:id="@+id/drawer_layout"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent">
-	<!-- The main content view -->
-	<include layout="@layout/activity_main"/>
-	<!-- The navigation drawer -->
-	<include layout="@layout/drawer"
-			android:layout_gravity="start"/>
-</android.support.v4.widget.DrawerLayout>
diff --git a/Habitica/res/menu/menu_main_activity_new.xml b/Habitica/res/menu/menu_main_activity_new.xml
index d1b7be2a1..5340a0803 100644
--- a/Habitica/res/menu/menu_main_activity_new.xml
+++ b/Habitica/res/menu/menu_main_activity_new.xml
@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.habitrpg.android.habitica.MainActivityNew">
+    tools:context="com.habitrpg.android.habitica.MainActivity">
 
     <!-- Search, should appear as action button -->
     <item android:id="@+id/action_search"
diff --git a/Habitica/res/values-v11/styles.xml b/Habitica/res/values-v11/styles.xml
index 7f292323d..f146e50d4 100644
--- a/Habitica/res/values-v11/styles.xml
+++ b/Habitica/res/values-v11/styles.xml
@@ -8,7 +8,7 @@
         <!-- API 11 theme customizations can go here. -->
     </style>
 
-    <style name="AppTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
         <item name="android:listSeparatorTextViewStyle">@style/MyOwnListSeperatorTextViewStyle
         </item>
         <!-- All customizations that are NOT specific to a particular API-level can go here. -->
diff --git a/Habitica/res/values-v14/styles.xml b/Habitica/res/values-v14/styles.xml
index f20e01501..f42f49d91 100644
--- a/Habitica/res/values-v14/styles.xml
+++ b/Habitica/res/values-v14/styles.xml
@@ -5,7 +5,7 @@
         AppBaseTheme from BOTH res/values/styles.xml and
         res/values-v11/styles.xml on API 14+ devices.
     -->
-    <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light.NoActionBar">
         <!-- API 14 theme customizations can go here. -->
     </style>
 
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index 2faf64d14..b80f20322 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -9,6 +9,7 @@
     <color name="mpColor">#4781e7</color>
     <color name="mpColorBackground">#eff4fd</color>
     <color name="mpColorForeground">#051228</color>
+    <color name="brand">#7a12f8</color>
 
     <!--  HabitRPG task color -->
     <color name="worst">#E6B8AF</color>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index a23bdefa7..a46421ab8 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -3,7 +3,7 @@
 
 
     <!-- Application theme. -->
-    <style name="AppTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
 		<item name="android:listSeparatorTextViewStyle">@style/MyOwnListSeperatorTextViewStyle</item>
 
         <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
@@ -66,8 +66,6 @@
 		<item name="android:textAllCaps"
             tools:targetApi="14">true</item>
 		<item name="android:textSize">14sp</item>
-
-
 	</style>
 
     <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
@@ -77,8 +75,8 @@
 
     <style name="CustomTheme" parent="style/MaterialDrawerTheme.TranslucentStatus">
         <!-- ...and here we setting appcompat’s color theming attrs -->
-        <item name="colorPrimary">@color/material_drawer_primary</item>
-        <item name="colorPrimaryDark">@color/material_drawer_primary_dark</item>
+        <item name="colorPrimary">@color/brand</item>
+        <item name="colorPrimaryDark">@color/brand</item>
         <item name="colorAccent">@color/md_amber_200</item>
 
         <!-- MaterialDrawer specific values -->
diff --git a/Habitica/src/com/habitrpg/android/habitica/AddTaskDialog.java b/Habitica/src/com/habitrpg/android/habitica/AddTaskDialog.java
index ccfd7acc0..83f0c2431 100644
--- a/Habitica/src/com/habitrpg/android/habitica/AddTaskDialog.java
+++ b/Habitica/src/com/habitrpg/android/habitica/AddTaskDialog.java
@@ -9,7 +9,6 @@ import android.app.DatePickerDialog.OnDateSetListener;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.graphics.Typeface;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.util.Log;
@@ -37,8 +36,6 @@ import com.magicmicky.habitrpgwrapper.lib.models.tasks.Reward;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.ToDo;
 import com.magicmicky.habitrpgwrapper.lib.utils.DaysUtils;
 
-import org.json.JSONObject;
-
 import static com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitType.*;
 import static com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitType.habit;
 
@@ -145,20 +142,20 @@ public class AddTaskDialog extends DialogFragment implements OnDateSetListener,
 
         if (mEditMode) {
 //			this.reconstructObjectFrom(json);
-            switch (hType) {
+            /*switch (hType) {
                 case todo:
-                    this.populate(((MainActivity) getActivity()).getTodo(pos));
+                    this.populate(((MainActivityOld) getActivity()).getTodo(pos));
                     break;
                 case daily:
-                    this.populate(((MainActivity) getActivity()).getDaily(pos));
+                    this.populate(((MainActivityOld) getActivity()).getDaily(pos));
                     break;
                 case reward:
-                    this.populate(((MainActivity) getActivity()).getReward(pos));
+                    this.populate(((MainActivityOld) getActivity()).getReward(pos));
                     break;
                 case habit:
-                    this.populate(((MainActivity) getActivity()).getHabit(pos));
+                    this.populate(((MainActivityOld) getActivity()).getHabit(pos));
                     break;
-            }
+            }*/
         }
         builder.setTitle(getString(R.string.new_task, hType.toString()))
                 .setPositiveButton(R.string.dialog_confirm_button, new DialogInterface.OnClickListener() {
diff --git a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java
index 12a590d0d..0759d3e49 100644
--- a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java
@@ -1,751 +1,475 @@
 package com.habitrpg.android.habitica;
 
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.res.Configuration;
-import android.os.Build;
+import android.databinding.DataBindingUtil;
+import android.graphics.Color;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.v4.app.ActionBarDrawerToggle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentManager;
+import android.os.Handler;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarActivity;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.text.method.LinkMovementMethod;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
 import android.util.Log;
-import android.view.KeyEvent;
+import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputMethodManager;
+import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.CheckedTextView;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.ListView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-import android.widget.TextView.OnEditorActionListener;
+import android.widget.Toast;
 
-import com.crashlytics.android.Crashlytics;
+import com.github.florent37.materialviewpager.MaterialViewPager;
 import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
 import com.habitrpg.android.habitica.callbacks.TaskCreationCallback;
 import com.habitrpg.android.habitica.callbacks.TaskDeletionCallback;
 import com.habitrpg.android.habitica.callbacks.TaskScoringCallback;
 import com.habitrpg.android.habitica.callbacks.TaskUpdateCallback;
+import com.habitrpg.android.habitica.databinding.SidebarHeaderBinding;
 import com.habitrpg.android.habitica.prefs.PrefsActivity;
 import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
-import com.habitrpg.android.habitica.ui.adapter.HabitItemAdapter;
-import com.habitrpg.android.habitica.ui.fragments.DailyFragment;
-import com.habitrpg.android.habitica.ui.fragments.RewardFragment;
-import com.habitrpg.android.habitica.ui.adapter.TagAdapter;
+import com.habitrpg.android.habitica.ui.EditTextDrawer;
+import com.habitrpg.android.habitica.ui.adapter.HabitItemRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.fragments.RecyclerViewFragment;
+import com.instabug.wrapper.support.activity.InstabugAppCompatActivity;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.magicmicky.habitrpgwrapper.lib.models.Tag;
 import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Daily;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Habit;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitItem;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitType;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Reward;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ToDo;
+import com.mikepenz.materialdrawer.Drawer;
+import com.mikepenz.materialdrawer.DrawerBuilder;
+import com.mikepenz.materialdrawer.model.DividerDrawerItem;
+import com.mikepenz.materialdrawer.model.PrimaryDrawerItem;
+import com.mikepenz.materialdrawer.model.SecondaryDrawerItem;
+import com.mikepenz.materialdrawer.model.SectionDrawerItem;
+import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
 
 import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
-import java.util.TimeZone;
+import java.util.Map;
 
-import de.keyboardsurfer.android.widget.crouton.Crouton;
-import de.keyboardsurfer.android.widget.crouton.Style;
-import io.fabric.sdk.android.Fabric;
+import butterknife.ButterKnife;
+import butterknife.InjectView;
+import retrofit.Callback;
+import retrofit.RetrofitError;
+import retrofit.client.Response;
 
+public class MainActivity extends InstabugAppCompatActivity implements OnTaskCreationListener, HabitRPGUserCallback.OnUserReceived,
+        TaskScoringCallback.OnTaskScored, TaskCreationCallback.OnHabitCreated, TaskUpdateCallback.OnHabitUpdated, TaskDeletionCallback.OnTaskDeleted, Callback<Void> {
+    static final int ABOUT = 12;
+
+    //region View Elements
+    @InjectView(R.id.materialViewPager)
+    MaterialViewPager materialViewPager;
+
+    Toolbar toolbar;
+    Drawer drawer;
+
+    Drawer filterDrawer;
+    //endregion
+
+    Map<Integer, RecyclerViewFragment> ViewFragmentsDictionary = new HashMap<Integer, RecyclerViewFragment>();
+
+    List<HabitItem> TaskList = new ArrayList<HabitItem>();
 
-/*
- * TODO: PAS DE QRCODE DANS LES PARAMETRE SUR ANDROID<3.0
- */
-public class MainActivity extends ActionBarActivity implements OnTaskCreationListener, HabitRPGUserCallback.OnUserReceived,
-        TaskScoringCallback.OnTaskScored, TaskCreationCallback.OnHabitCreated, TaskUpdateCallback.OnHabitUpdated, TaskDeletionCallback.OnTaskDeleted {
-    private static final String TAG = "MainActivity";
-	private HabitItemAdapter mPagerAdapter;
-	private ViewPager mPager;
-	private DrawerLayout mDrawerLayout;
-	private ListView mDrawerList;
-	private ProgressBar mProgressBar;
-	private EditText mCreateTaskText;
-	private ImageButton mCreateTask;
-	private ImageButton mEditTask;
-	private HabitRPGUser user = new HabitRPGUser();
-	private APIHelper mAPIHelper;
-	private ActionBarDrawerToggle mDrawerToggle;
-	private View mLeftDrawer;
-	private List<String> selectedTags = new ArrayList<String>();
-	private TagAdapter mTagAdapter;
     private HostConfig hostConfig;
-    private int nbRequests=0;
+    APIHelper mAPIHelper;
 
-	AvatarWithBarsViewModel avatarWithBarsViewModel;
+    android.support.v4.view.ViewPager viewPager;
+
+    // just to test the view
+    public HabitRPGUser User = null;
+
+    AvatarWithBarsViewModel avatarInHeader;
 
     @Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main_new);
 
-		setContentView(R.layout.main_with_drawer);
+        // Inject Controls
+        ButterKnife.inject(this);
 
-		if (!BuildConfig.DEBUG) {
-			Crashlytics crashlytics = new Crashlytics.Builder().build();
-			Fabric.with(this, crashlytics);
-		}
-		this.hostConfig = PrefsActivity.fromContext(this);
-		if(hostConfig==null|| hostConfig.getApi()==null || hostConfig.getApi().equals("") || hostConfig.getUser() == null ||hostConfig.getUser().equals("")) {
-            startActivity(new Intent(MainActivity.this, LoginActivity.class));
-			finish();
-		} else {
-            if(this.isThisFirstTimeSinceUpdate()) {
-               // ChangeLogDialog _ChangelogDialog = new ChangeLogDialog(this);
-               // _ChangelogDialog.show(getSupportFragmentManager());
+        this.hostConfig = PrefsActivity.fromContext(this);
+
+        toolbar = materialViewPager.getToolbar();
+        setSupportActionBar(toolbar);
+
+        if (toolbar != null) {
+            setSupportActionBar(toolbar);
+
+            ActionBar actionBar = getSupportActionBar();
+
+            if(actionBar != null) {
+                actionBar.setDisplayHomeAsUpEnabled(true);
+                actionBar.setDisplayShowHomeEnabled(false);
+                actionBar.setDisplayShowTitleEnabled(true);
+                actionBar.setDisplayUseLogoEnabled(false);
+                actionBar.setHomeButtonEnabled(false);
             }
+
+            toolbar.setPadding(0, getResources().getDimensionPixelSize(R.dimen.tool_bar_top_padding), 0, 0);
         }
 
-		/*
-		 * Retrieve all the views
-		 */
-		this.mEditTask = (ImageButton) this.findViewById(R.id.BT_editTask);
-		this.mProgressBar = (ProgressBar) this.findViewById(R.id.PB_AsyncTask);
-		this.mCreateTask = (ImageButton) this.findViewById(R.id.BT_task_new);
-		this.mCreateTaskText = (EditText) this.findViewById(R.id.ET_addTask);
+        materialViewPager.setBackgroundColor(getResources().getColor(R.color.white));
 
-		this.mCreateTask.setEnabled(false);
-		this.mCreateTaskText.addTextChangedListener(new TextWatcher() {
-			@Override
-			public void onTextChanged(CharSequence s, int start, int before, int count) {
-				if (mCreateTaskText.getText() == null || mCreateTaskText.getText().toString().equals(""))
-					mCreateTask.setEnabled(false);
-				else
-					mCreateTask.setEnabled(true);
-			}
+        View mPagerRootView = materialViewPager.getRootView();
 
-			@Override
-			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-			}
+        View avatarHeaderView = mPagerRootView.findViewById(R.id.avatar_with_bars_layout);
 
-			@Override
-			public void afterTextChanged(Editable s) {
-			}
-		});
-		this.mCreateTask.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				addTask(mCreateTaskText.getText().toString());
-				hideKeyboard(mCreateTaskText);
-			}
-		});
-		 this.mCreateTaskText.setOnEditorActionListener(new OnEditorActionListener() {
-			 @Override
-			 public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-				 if (actionId == EditorInfo.IME_ACTION_DONE) {
-					 addTask(mCreateTaskText.getText().toString());
-					 hideKeyboard(mCreateTaskText);
-					 return true;
-				 }
-				 return false;
-			 }
-		 });
-		 this.mEditTask.setOnClickListener(new OnClickListener() {
-			 @Override
-			 public void onClick(View v) {
-				 Bundle b = new Bundle();
-				 b.putString("type", mPager != null ? getTaskType(mPager.getCurrentItem()) : HabitType.habit.toString());
-				 b.putString("text", mCreateTaskText.getText().toString());
-				 DialogFragment dialog = new AddTaskDialog();
-				 dialog.setArguments(b);
-				 dialog.show(getSupportFragmentManager(), "AddTaskDialog");
-			 }
-		 });
-		FragmentManager fm = super.getSupportFragmentManager();
+        avatarInHeader = new AvatarWithBarsViewModel(this, avatarHeaderView);
 
-		View avatarWithBars = findViewById(R.id.avatar_with_bars);
+        drawer = new DrawerBuilder()
+                .withActivity(this)
+                .withToolbar(toolbar)
+                .withHeaderDivider(false)
+                .withTranslucentStatusBar(true)
+                .withAnimateDrawerItems(true)
+                .addDrawerItems(
+                        new PrimaryDrawerItem().withName("Tasks"),
 
-		avatarWithBarsViewModel = new AvatarWithBarsViewModel(this, avatarWithBars);
+                        new SectionDrawerItem().withName("Social"),
+                        new PrimaryDrawerItem().withName("Tavern"),
+                        new PrimaryDrawerItem().withName("Party"),
+                        new PrimaryDrawerItem().withName("Guilds"),
+                        new PrimaryDrawerItem().withName("Challenges"),
 
-		mPagerAdapter = new HabitItemAdapter(fm);
-        mPager = (ViewPager) findViewById(R.id.home_pannels_pager);
-        mPager.setAdapter(mPagerAdapter);
-        mPager.setCurrentItem(0);
-		this.mPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-			@Override
-			public void onPageSelected(int pos) {
-                switch(pos) {
-                    case 0://
-                        mCreateTaskText.setHint(R.string.create_habit_hint);
+
+                        new SectionDrawerItem().withName("Inventory"),
+
+                        new PrimaryDrawerItem().withName("Avatar"),
+                        new PrimaryDrawerItem().withName("Equipment"),
+                        new PrimaryDrawerItem().withName("Stable"),
+
+                        new DividerDrawerItem(),
+                        new SecondaryDrawerItem().withName("News"),
+                        new SecondaryDrawerItem().withName("Settings"),
+                        new SecondaryDrawerItem().withName("About").withIdentifier(ABOUT)
+
+                )
+                .withStickyFooterDivider(false)
+                .withOnDrawerItemClickListener(new Drawer.OnDrawerItemClickListener() {
+                    @Override
+                    public boolean onItemClick(AdapterView<?> parent, View view, int position, long id, IDrawerItem drawerItem) {
+                        // do something with the clicked item :D
+
+                        switch (drawerItem.getIdentifier()) {
+                            case ABOUT:
+                                startActivity(new Intent(MainActivity.this, AboutActivity.class));
+
+                                return false;
+                        }
+
+                        return true;
+                    }
+                })
+
+                .build();
+
+        final android.content.Context context = getApplicationContext();
+
+        filterDrawer = new DrawerBuilder()
+                .withActivity(this)
+                .withOnDrawerItemLongClickListener(new Drawer.OnDrawerItemLongClickListener() {
+                    @Override
+                    public boolean onItemLongClick(AdapterView<?> adapterView, View view, int i, long l, IDrawerItem iDrawerItem) {
+                        Toast toast = Toast.makeText(context, "Long Pressed", Toast.LENGTH_LONG);
+
+                        toast.show();
+
+                        return true;
+                    }
+                })
+                .withDrawerGravity(Gravity.RIGHT)
+                .append(drawer);
+
+
+        viewPager = materialViewPager.getViewPager();
+        viewPager.setOffscreenPageLimit(6);
+
+
+
+
+        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {}
+
+            @Override
+            public void onPageSelected(int position) {
+
+                Log.d("PageSelected", "P=" + position);
+
+                RecyclerViewFragment fragment = ViewFragmentsDictionary.get(position);
+
+                if (fragment == null || fragment.mRecyclerView == null)
+                    return;
+
+                // fragment.mRecyclerView.smoothScrollToPosition(r.nextInt(fragment.mRecyclerView.getAdapter().getItemCount()));
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+
+            }
+        });
+        materialViewPager.getViewPager().setCurrentItem(1);
+
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        this.mAPIHelper = new APIHelper(this, hostConfig);
+
+        mAPIHelper.retrieveUser(new HabitRPGUserCallback(this));
+    }
+
+    public void FillTasks()
+    {
+        android.support.v4.app.FragmentManager fragmentManager = getSupportFragmentManager();
+
+        viewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) {
+
+            int oldPosition = -1;
+
+            @Override
+            public Fragment getItem(int position) {
+                int layoutOfType;
+                RecyclerViewFragment fragment;
+
+                String fragmentkey = "Recycler$" + position;
+
+                switch (position) {
+                    case 0:
+                        layoutOfType = R.layout.habit_item_card;
+                        fragment = RecyclerViewFragment.newInstance(new HabitItemRecyclerViewAdapter(User.getHabits(), layoutOfType, HabitItemRecyclerViewAdapter.HabitViewHolder.class), fragmentkey);
                         break;
-                    case 1://Daily
-                        mCreateTaskText.setHint(R.string.create_daily_hint);
+                    case 1:
+                        layoutOfType = R.layout.daily_item_card;
+                        fragment = RecyclerViewFragment.newInstance(new HabitItemRecyclerViewAdapter(User.getDailys(), layoutOfType, HabitItemRecyclerViewAdapter.DailyViewHolder.class), fragmentkey);
                         break;
-                    case 2://To Do
-                        mCreateTaskText.setHint(R.string.create_todo_hint);
-                        break;
-                    case 3://Reward
-                        mCreateTaskText.setHint(R.string.create_reward_hint);
+                    case 3:
+                        layoutOfType = R.layout.reward_item_card;
+                        fragment = RecyclerViewFragment.newInstance(new HabitItemRecyclerViewAdapter(User.getRewards(), layoutOfType, HabitItemRecyclerViewAdapter.RewardViewHolder.class), fragmentkey);
                         break;
+                    default:
+                        layoutOfType = R.layout.todo_item_card;
+                        fragment = RecyclerViewFragment.newInstance(new HabitItemRecyclerViewAdapter(User.getTodos(), layoutOfType, HabitItemRecyclerViewAdapter.TodoViewHolder.class), fragmentkey);
                 }
+
+                // ViewFragmentsDictionary.put(position, fragment);
+
+                return fragment;
             }
-            @Override public void onPageScrolled(int i, float v, int i2) {}
-			@Override public void onPageScrollStateChanged(int i) {}
-		});
-		mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
-		mLeftDrawer = findViewById(R.id.left_drawer);
-		mDrawerList = (ListView) findViewById(R.id.LV_drawer_tag);
-		mDrawerToggle = new ActionBarDrawerToggle(
-				this,                  /* host Activity */
-				mDrawerLayout,         /* DrawerLayout object */
-				R.drawable.ic_drawer,  /* nav drawer icon to replace 'Up' caret */
-				R.string.drawer_open,  /* "open drawer" description */
-				R.string.drawer_close  /* "close drawer" description */
-		) {
-			/** Called when a drawer has settled in a completely closed state. */
-			public void onDrawerClosed(View view) {	}
-			/** Called when a drawer has settled in a completely open state. */
-			public void onDrawerOpened(View drawerView) {}
-		};
 
-		// Set the drawer toggle as the DrawerListener
-		mDrawerLayout.setDrawerListener(mDrawerToggle);
-	}
+            @Override
+            public int getCount() {
+                return 4;
+            }
+
+            @Override
+            public CharSequence getPageTitle(int position) {
+                switch (position) {
+                    case 0:
+                        return "Habits";
+                    case 1:
+                        return "Dailies";
+                    case 2:
+                        return "Todos";
+                    case 3:
+                        return "Rewards";
+             /*       case 4:
+                        return "Skills";
+
+                    case 5:
+                        return "Skills 2";*/
+                }
+                return "";
+            }
 
 
+        });
 
-	@Override
-	protected void onPostCreate(Bundle savedInstanceState) {
-		super.onPostCreate(savedInstanceState);
-		mDrawerToggle.syncState();
-	}
+        materialViewPager.getPagerTitleStrip().setViewPager(viewPager);
+    }
 
-	@Override
-	public void onConfigurationChanged(Configuration newConfig) {
-		super.onConfigurationChanged(newConfig);
-		mDrawerToggle.onConfigurationChanged(newConfig);
-	}
+    public void FillTagFilterDrawer() {
+        filterDrawer.removeAllItems();
+        filterDrawer.addItems(
+                new SectionDrawerItem().withName("Filter by Tag"),
+                new EditTextDrawer()
 
-	@Override
-	protected void onResume() {
-		super.onResume();
-		mTagAdapter = new TagAdapter(this);
+        );
 
-		mDrawerList.setAdapter(mTagAdapter);
-
-        mDrawerList.setOnItemClickListener(new ListView.OnItemClickListener() {
-			@Override
-			public void onItemClick(AdapterView parent, View view, int position, long id) {
-				selectTag(position, view);
-			}
-		});
-		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-		getSupportActionBar().setHomeButtonEnabled(true);
-
-		this.mAPIHelper = new APIHelper(this, hostConfig);
-        this.onPreResult();
-		mAPIHelper.retrieveUser(new HabitRPGUserCallback(this));
-	}
-
-	protected void onDestroy() {
-		Crouton.cancelAllCroutons();
-		super.onDestroy();
-	}
-	private String getTaskType(int pos) {
-		return pos== 1? HabitType.daily.toString()
-				: pos==0 ? HabitType.habit.toString()
-				: pos==3 ? HabitType.reward.toString()
-				: HabitType.todo.toString();
-	}
-	private void notifyDataChanged() {
-		this.getSupportActionBar().setTitle(createTitle(user));
-        List<HabitItem> items = new ArrayList<>();
-        items.addAll(user.getHabits());
-        items.addAll(user.getDailys());
-        items.addAll(user.getRewards());
-        items.addAll(user.getTodos());
-		mPagerAdapter.notifyFragments(items);
-		((DailyFragment) mPagerAdapter.getItem(1)).setDayStart(user.getPreferences().getDayStart());
-		((RewardFragment) mPagerAdapter.getItem(3)).setGold(user.getStats().getGp());
-
-		//this.username_TV.setText(user.getName());
-		this.avatarWithBarsViewModel.UpdateData(user);
-
-		if(this.mDrawerList!=null) {
-			this.mTagAdapter.updateTags(user.getTags());
-			this.mTagAdapter.notifyDataSetChanged();
-		}
-        if(user.getStats().getHp()==0) {
-            showRevivePopUp();
+        for (Tag t : User.getTags()) {
+            filterDrawer.addItem(
+                    new PrimaryDrawerItem().withName(t.getName()).withBadge("" + CountTagUsedInTasks(t.getId()))
+            );
         }
 
-	}
 
-	private String createTitle(HabitRPGUser user) {
-		//return user.getName()!=null ? user.getName() + " - lvl" + user.getLvl() : getString(R.string.app_name);
-        return user.getProfile().getName();
-	}
+    }
 
-	private void notifyUser(double xp, double hp, double gold,
-			double lvl, double delta) {
-		StringBuilder message = new StringBuilder();
-		boolean neg = false;
-		if(lvl > user.getStats().getLvl()) {
-			message.append(getString(R.string.lvlup));
-			//If user lvl up, we need to fetch again the data from the server...
-            this.onPreResult();
-			this.mAPIHelper.retrieveUser(new HabitRPGUserCallback(this));
-			user.getStats().setLvl((int) lvl);
-			Crouton.makeText(this, message, Style.CONFIRM).show();
-		} else {
-			if(xp>user.getStats().getExp()) {
-				message.append("+ ").append(round(xp -user.getStats().getExp(),2)).append(" XP");
-				user.getStats().setExp(xp + user.getStats().getExp());
-			}
-			if(hp != user.getStats().getHp()) {
-				neg=true;
-				message.append("- ").append(round(user.getStats().getHp() - hp,2)).append(" HP");
-				user.getStats().setHp(hp);
-			}
-			if(gold > user.getStats().getGp()) {
-				message.append("+ ").append(round(gold - user.getStats().getGp(),2)).append(" GP");
-				user.getStats().setGp(gold);
-			} else if(gold < user.getStats().getGp()) {
-				neg=true;
-				message.append("- ").append(round(user.getStats().getGp() - gold,2)).append(" GP");
-                user.getStats().setGp(gold);
-			}
-			Crouton.makeText(this, message, neg ? Style.ALERT : Style.INFO).show();
-		}
-		notifyDataChanged();
-	}
+    /**
+     * Anyone a better solution to count the Tag?
+     */
+    public int CountTagUsedInTasks(String tagId) {
+        int count = 0;
 
-	private void addTask(String text) {
-		HabitItem item;
-		Log.d(TAG + "CurrentItem", this.mPager.getCurrentItem() + "");
-		switch(this.mPager.getCurrentItem()) {
-		case 1:
-			item = new Daily(null, "", null, text, (double) 0, false, null);
-			break;
-		case 2:
-			item = new ToDo(null, "", null, text, 0, false, "");
-			break;
-		case 3:
-			item = new Reward(null, "", null, text, 20);
-			break;
-		default:
-			item = new Habit(null, "", null, text, 0, true, true);
+        for (HabitItem task : TaskList) {
+            if (task.getTags().contains(tagId))
+                count++;
+        }
 
-		}
-		this.onTaskCreation(item,false);
-	}
-	private void hideKeyboard(EditText v) {
-		v.setText("");
-        InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
+        return count;
+    }
 
-	}
+    public int adjustAlpha(int color, float factor) {
+        int alpha = Math.round(Color.alpha(color) * factor);
+        int red = Color.red(color);
+        int green = Color.green(color);
+        int blue = Color.blue(color);
+        return Color.argb(alpha, red, green, blue);
+    }
 
-
-	@Override
-	public void onTaskCreation(HabitItem task, boolean editMode) {
-        this.onPreResult();
-		if(!editMode) {
-			List<String> tagsIds = this.selectedTags;
-			task.setTags(tagsIds);
-			this.mAPIHelper.createUndefNewTask(task, new TaskCreationCallback(this));
-		} else {
-			this.mAPIHelper.uprateUndefinedTask(task, new TaskUpdateCallback(this));
-		}
-	}
-
-	@Override
-	public void onTaskCreationFail(String message) {
-		Crouton.makeText(this, message, Style.ALERT).show();
-	}
     @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        return super.onPrepareOptionsMenu(menu);
-    }
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.main, menu);
-        return super.onCreateOptionsMenu(menu);
-	}
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-
-		// Pass the event to ActionBarDrawerToggle, if it returns
-		// true, then it has handled the app icon touch event
-		if (mDrawerToggle.onOptionsItemSelected(item)) {
-			return true;
-		}
-		switch(item.getItemId()) {
-			case R.id.action_showTestActivity:
-				startActivity(new Intent(this, MainActivityNew.class));
-				break;
-			case R.id.action_showChangelogActivity:
-				startActivity(new Intent(this, AboutActivity.class));
-				break;
-			case R.id.action_settings:
-				startActivity(new Intent(this, PrefsActivity.class));
-				break;
-			case R.id.action_refresh:
-                this.onPreResult();
-	        	this.mAPIHelper.retrieveUser(new HabitRPGUserCallback(this));
-	        	break;
-			case R.id.action_logout:
-				SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-				SharedPreferences.Editor editor = prefs.edit();
-				editor.putString(getString(R.string.SP_APIToken), "")
-						.putString(getString(R.string.SP_userID), "")
-						.commit();
-				startActivity(new Intent(MainActivity.this, LoginActivity.class));
-				finish();
-
-		}
-		return super.onOptionsItemSelected(item);
-	}
-    public void onPreResult() {
-        mProgressBar.setVisibility(View.VISIBLE);
-        this.nbRequests++;
-    }
-    private void afterResults() {
-        this.nbRequests--;
-        if(this.nbRequests<=0)
-            mProgressBar.setVisibility(View.INVISIBLE);
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.menu_main_activity_new, menu);
+        return true;
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        switch (id) {
+            case R.id.action_search:
+                filterDrawer.openDrawer();
+
+                return true;
+            case R.id.action_toggle_sleep:
+                mAPIHelper.toggleSleep(this);
+
+                User.getPreferences().setSleep(!User.getPreferences().isSleep());
+
+                updateUserAvatars();
+
+                return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void updateUserAvatars()
+    {
+        avatarInHeader.UpdateData(User);
+    }
 
     @Override
     public void onUserReceived(HabitRPGUser user) {
-        this.user = user;
+        TaskList.clear();
 
-        this.notifyDataChanged();
-        afterResults();
-//        checkTimeZone(habitRPGUser.getTimeZoneOffset());
+        User = user;
+
+        if(user == null)
+            return;
+
+        toolbar.setTitle(User.getProfile().getName() + " - Lv" + User.getStats().getLvl());
+
+        TaskList.addAll(User.getHabits());
+        TaskList.addAll(User.getDailys());
+        TaskList.addAll(User.getTodos());
+        TaskList.addAll(User.getRewards());
+
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+
+                FillTasks();
+
+                updateUserAvatars();
+
+                android.support.v7.app.ActionBarDrawerToggle actionBarDrawerToggle = drawer.getActionBarDrawerToggle();
+
+                if (actionBarDrawerToggle != null) {
+                    actionBarDrawerToggle.setDrawerIndicatorEnabled(true);
+                }
+
+
+                FillTagFilterDrawer();
+            }
+        }, 100);
     }
 
     @Override
     public void onUserFail() {
-        //TODO
-        Crouton.makeText(this,R.string.unknown_error,Style.ALERT).show();
-        afterResults();
 
     }
 
     @Override
-    public void onTaskDataReceived(TaskDirectionData data) {
-        notifyUser(data.getExp(), data.getHp(),data.getGp(),data.getLvl(),data.getDelta());
-        afterResults();
-        Log.d(TAG, "Successfully tasked up/down");
+    public void success(Void aVoid, Response response) {
 
     }
 
     @Override
-    public void onTaskScoringFailed() {
-        Log.d(TAG, "Failed tasking up/down");
-        afterResults();
+    public void failure(RetrofitError error) {
 
     }
 
     @Override
     public void onTaskCreated(HabitItem habit) {
-        if(habit instanceof Habit) {
-            user.getHabits().add((Habit) habit);
-        } else if(habit instanceof ToDo) {
-            user.getTodos().add((ToDo) habit);
-        } else if(habit instanceof Daily) {
-            user.getDailys().add((Daily) habit);
-        } else {
-            user.getRewards().add((Reward) habit);
-        }
-        Crouton.makeText(MainActivity.this, MainActivity.this.getString(R.string.new_task_added_message), Style.INFO).show();
-        notifyDataChanged();
-        afterResults();
 
     }
 
     @Override
     public void onTaskCreationFail() {
-        Log.d(TAG, "Failed creating task");
-        afterResults();
+
     }
 
     @Override
     public void onTaskUpdated(HabitItem habit) {
-        if(habit instanceof Habit) {
-            updateHabit((Habit) habit);
-        } else if(habit instanceof ToDo) {
-            updateToDo((ToDo) habit);
-        } else if(habit instanceof Daily) {
-            updateDaily((Daily) habit);
-        } else {
-            updateReward((Reward) habit);
-        }
-        Crouton.makeText(MainActivity.this, MainActivity.this.getString(R.string.task_edited), Style.INFO).show();
-        notifyDataChanged();
-        afterResults();
+
     }
 
     @Override
     public void onTaskUpdateFail() {
-        Log.d(TAG, "Failed updating task");
-        afterResults();
 
     }
 
+    @Override
+    public void onTaskCreation(HabitItem task, boolean editMode) {
+
+    }
+
+    @Override
+    public void onTaskCreationFail(String message) {
+
+    }
 
     @Override
     public void onTaskDeleted(HabitItem deleted) {
-        Crouton.makeText(MainActivity.this, MainActivity.this.getString(R.string.task_deleted, deleted.getText()), Style.INFO).show();
-        if(deleted instanceof Habit) {
-            removeHabit((Habit) deleted);
-        } else if(deleted instanceof ToDo) {
-            removeToDo((ToDo) deleted);
-        } else if(deleted instanceof Daily) {
-            removeDaily((Daily) deleted);
-        } else {
-            removeReward((Reward) deleted);
-        }
-        afterResults();
-        notifyDataChanged();
 
     }
 
-
     @Override
     public void onTaskDeletionFail() {
 
     }
 
-
-
-	/** Swaps fragments in the main content view */
-	private void selectTag(int position, View viewClicked) {
-		// Create a new fragment and specify the planet to show based on position
-		String tagId = ((TagAdapter)mDrawerList.getAdapter()).getTagId(position);
-		this.mDrawerList.setSelection(position);
-		if(Build.VERSION.SDK_INT <= Build.VERSION_CODES.HONEYCOMB) {
-			CheckedTextView cbtv = (CheckedTextView) viewClicked;
-			cbtv.setChecked(!cbtv.isChecked());
-		}
-		if(this.selectedTags==null) {
-			selectedTags = new ArrayList<String>();
-		}
-		if(!selectedTags.contains(tagId)) {
-			selectedTags.add(tagId);
-			mDrawerList.setItemChecked(position, true);
-		} else {
-			selectedTags.remove(tagId);
-			mDrawerList.setItemChecked(position, false);
-		}
-		mPagerAdapter.filterFragments(selectedTags);
-		mDrawerLayout.closeDrawer(mLeftDrawer);
-	}
-
-
-
-
-	static public Double round(Double value, int n) {
-		double r = (Math.round(value.doubleValue() * Math.pow(10, n))) / (Math.pow(10, n));
-		return Double.valueOf(r);
-	}
-	public static int getTimeZoneOffset(Calendar cal) {
-		Date date = cal.getTime();
-		TimeZone tz = cal.getTimeZone();
-		//Returns the number of milliseconds since January 1, 1970, 00:00:00 GMT
-		long msFromEpochGmt = date.getTime();
-		int offsetFromUTC = tz.getOffset(msFromEpochGmt)/1000/60;
-		return (-1)*offsetFromUTC;
-	}
-
-    public Habit getHabit(int pos) {
-        return user.getHabits().get(pos);
-    }
-
-    public ToDo getTodo(int pos) {
-
-        return user.getTodos().get(pos);
-    }
-
-    public Daily getDaily(int pos) {
-        return user.getDailys().get(pos);
-    }
-
-    public Reward getReward(int pos) {
-        return user.getRewards().get(pos);
-    }
-
-
-    void updateHabit(Habit item) {
-        List<Habit> habits = user.getHabits();
-        for(int i=0;i<habits.size();i++) {
-            if(habits.get(i).getId().equals(item.getId())) {
-                habits.set(i, item);
-            }
-        }
-    }
-    void updateToDo(ToDo item) {
-        List<ToDo> items = user.getTodos();
-        for(int i=0;i<items.size();i++) {
-            if(items.get(i).getId().equals(item.getId())) {
-                items.set(i, item);
-            }
-        }
-    }
-    void updateDaily(Daily item) {
-        List<Daily> items = user.getDailys();
-        for(int i=0;i<items.size();i++) {
-            if(items.get(i).getId().equals(item.getId())) {
-                items.set(i, item);
-            }
-        }
-    }
-    void updateReward(Reward item) {
-        List<Reward> items = user.getRewards();
-        for(int i=0;i<items.size();i++) {
-            if(items.get(i).getId().equals(item.getId())) {
-                items.set(i, item);
-            }
-        }
-    }
-
-    private void removeHabit(Habit item) {
-        List<Habit> items = user.getHabits();
-        for(int i=0;i<items.size();i++) {
-            if(items.get(i).getId().equals(item.getId())) {
-                items.remove(i);
-            }
-        }
-    }
-
-    private void removeToDo(ToDo item) {
-        List<ToDo> items = user.getTodos();
-        for(int i=0;i<items.size();i++) {
-            if(items.get(i).getId().equals(item.getId())) {
-                items.remove(i);
-            }
-        }
-    }
-
-    private void removeDaily(Daily item) {
-        List<Daily> items = user.getDailys();
-        for(int i=0;i<items.size();i++) {
-            if(items.get(i).getId().equals(item.getId())) {
-                items.remove(i);
-            }
-        }
-    }
-    private void removeReward(Reward item) {
-        List<Reward> items = user.getRewards();
-        for(int i=0;i<items.size();i++) {
-            if(items.get(i).getId().equals(item.getId())) {
-                items.remove(i);
-            }
-        }
-    }
-/*	OnHabitsAPIResult callback = new OnHabitsAPIResult() {
-		Handler mainHandler;
-		private int nbRequests=0;
-
-		@Override
-		public void onError(HabitRPGException error) {
-			final HabitRPGException err = error;
-			mainHandler = new Handler(getMainLooper());
-			Runnable myRunnable = new Runnable(){
-				public void run() {
-					afterResults();
-					String myMessage=err!=null ? err.getMessage() : null;
-					if(myMessage == null)
-						myMessage= getString(R.string.unknown_error);
-					Crouton.makeText(MainActivity.this, myMessage, Style.ALERT).show();
-				}
-			};
-			mainHandler.post(myRunnable);
-
-		}
-
-		@Override
-		public void onUserItemsReceived(UserLook.UserItems userItems, Reward.SpecialReward iBought) {
-			final UserLook.UserItems uItems = userItems;
-            final Reward.SpecialReward itemBought = iBought;
-			mainHandler = new Handler(getMainLooper());
-			Runnable myRunnable = new Runnable(){
-				public void run() {
-					//user.addTask(task);
-					if(user!=null) {
-						user.getLook().setItems(uItems);
-                        user.setGp(user.getGp()-itemBought.getValue());
-						Crouton.makeText(MainActivity.this, MainActivity.this.getString(R.string.item_bought, itemBought.getText()), Style.INFO).show();
-						notifyDataChanged();
-						afterResults();
-					}
-				}
-			};
-			mainHandler.post(myRunnable);
-
-		}
-
-	};*/
-
-	private void showRevivePopUp() {
-		//final SpannableString mess = new SpannableString(getString(R.string.helpString));
-		//Linkify.addLinks(mess, Linkify.ALL);
-		AlertDialog d =new AlertDialog.Builder(this)
-				.setTitle(R.string.user_dead_title)
-				.setMessage(R.string.user_dead_mess).setCancelable(false)
-				.setPositiveButton(R.string.string_revive, new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						mAPIHelper.revive();
-						dialog.dismiss();
-					}
-
-				}).create();
-		d.show();
-		((TextView)d.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
-		((TextView)d.findViewById(android.R.id.message)).setTextSize(13);
-	}
-
-	private void checkTimeZone(int currentUserTimeZone) {
-		Calendar cal = Calendar.getInstance();
-		int offset = getTimeZoneOffset(cal);
-		if(currentUserTimeZone!= offset) {
-			mAPIHelper.changeTimeZone(offset);
-			Log.w(TAG + "_Offset","ChangingTimeZone");
-		}
-
-	}
-
-    private boolean isThisFirstTimeSinceUpdate() {
-        boolean res;
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        String version = "";
-        try {
-            PackageInfo _info = this.getPackageManager().getPackageInfo(this.getPackageName(), 0);
-            version = _info.versionName;
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-        }
-        if(!version.equals(prefs.getString(getString(R.string.SP_last_seen_version), "OMG"))) {
-            res=true;
-            prefs.edit().putString(getString(R.string.SP_last_seen_version), version).commit();
-        } else {
-            res=false;
-        }
-        return res;
+    @Override
+    public void onTaskDataReceived(TaskDirectionData data) {
 
     }
 
+    @Override
+    public void onTaskScoringFailed() {
 
-}
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/com/habitrpg/android/habitica/MainActivityNew.java b/Habitica/src/com/habitrpg/android/habitica/MainActivityNew.java
deleted file mode 100644
index 8cddb1235..000000000
--- a/Habitica/src/com/habitrpg/android/habitica/MainActivityNew.java
+++ /dev/null
@@ -1,474 +0,0 @@
-package com.habitrpg.android.habitica;
-
-import android.content.Intent;
-import android.databinding.DataBindingUtil;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.os.Handler;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.Toast;
-
-import com.github.florent37.materialviewpager.MaterialViewPager;
-import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
-import com.habitrpg.android.habitica.databinding.SidebarHeaderBinding;
-import com.habitrpg.android.habitica.prefs.PrefsActivity;
-import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
-import com.habitrpg.android.habitica.ui.EditTextDrawer;
-import com.habitrpg.android.habitica.ui.adapter.HabitItemRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.fragments.RecyclerViewFragment;
-import com.instabug.wrapper.support.activity.InstabugAppCompatActivity;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Tag;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitItem;
-import com.mikepenz.materialdrawer.Drawer;
-import com.mikepenz.materialdrawer.DrawerBuilder;
-import com.mikepenz.materialdrawer.model.DividerDrawerItem;
-import com.mikepenz.materialdrawer.model.PrimaryDrawerItem;
-import com.mikepenz.materialdrawer.model.SecondaryDrawerItem;
-import com.mikepenz.materialdrawer.model.SectionDrawerItem;
-import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import butterknife.ButterKnife;
-import butterknife.InjectView;
-import retrofit.Callback;
-import retrofit.RetrofitError;
-import retrofit.client.Response;
-
-public class MainActivityNew extends InstabugAppCompatActivity
-        implements HabitRPGUserCallback.OnUserReceived, Callback<Void> {
-    static final int ABOUT = 12;
-
-    //region View Elements
-    @InjectView(R.id.materialViewPager)
-    MaterialViewPager materialViewPager;
-
-    Toolbar toolbar;
-    Drawer drawer;
-
-    Drawer filterDrawer;
-    //endregion
-
-    Map<Integer, RecyclerViewFragment> ViewFragmentsDictionary = new HashMap<Integer, RecyclerViewFragment>();
-
-    List<HabitItem> TaskList = new ArrayList<HabitItem>();
-
-    private HostConfig hostConfig;
-    APIHelper mAPIHelper;
-
-    android.support.v4.view.ViewPager viewPager;
-
-    // just to test the view
-    public HabitRPGUser User = null;
-
-    AvatarWithBarsViewModel avatarInSidebar;
-    AvatarWithBarsViewModel avatarInHeader;
-    SidebarHeaderBinding sidebarHeaderBinding;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main_new);
-
-        // Inject Controls
-        ButterKnife.inject(this);
-
-        this.hostConfig = PrefsActivity.fromContext(this);
-
-        toolbar = materialViewPager.getToolbar();
-        setSupportActionBar(toolbar);
-
-        if (toolbar != null) {
-            setSupportActionBar(toolbar);
-
-            ActionBar actionBar = getSupportActionBar();
-
-            if(actionBar != null) {
-                actionBar.setDisplayHomeAsUpEnabled(true);
-                actionBar.setDisplayShowHomeEnabled(false);
-                actionBar.setDisplayShowTitleEnabled(true);
-                actionBar.setDisplayUseLogoEnabled(false);
-                actionBar.setHomeButtonEnabled(false);
-            }
-
-            toolbar.setPadding(0, getResources().getDimensionPixelSize(R.dimen.tool_bar_top_padding), 0, 0);
-        }
-
-        materialViewPager.setBackgroundColor(getResources().getColor(R.color.white));
-
-
-        View sidebarHeaderView = LayoutInflater.from(this).inflate(R.layout.sidebar_header, null, false);
-
-        sidebarHeaderBinding = DataBindingUtil.bind(sidebarHeaderView);
-
-        avatarInSidebar = new AvatarWithBarsViewModel(this, sidebarHeaderView.findViewById(R.id.avatar_with_bars));
-
-        View mPagerRootView = materialViewPager.getRootView();
-
-        View avatarHeaderView = mPagerRootView.findViewById(R.id.avatar_with_bars_layout);
-
-        avatarInHeader = new AvatarWithBarsViewModel(this, avatarHeaderView);
-
-        drawer = new DrawerBuilder()
-                .withActivity(this)
-                .withToolbar(toolbar)
-                .withHeaderDivider(false)
-                .withTranslucentStatusBar(true)
-                .withAnimateDrawerItems(true)
-                .addDrawerItems(
-                        new PrimaryDrawerItem().withName("Tasks"),
-
-                        new SectionDrawerItem().withName("Social"),
-                        new PrimaryDrawerItem().withName("Tavern"),
-                        new PrimaryDrawerItem().withName("Party"),
-                        new PrimaryDrawerItem().withName("Guilds"),
-                        new PrimaryDrawerItem().withName("Challenges"),
-
-
-                        new SectionDrawerItem().withName("Inventory"),
-
-                        new PrimaryDrawerItem().withName("Avatar"),
-                        new PrimaryDrawerItem().withName("Equipment"),
-                        new PrimaryDrawerItem().withName("Stable"),
-
-                        new DividerDrawerItem(),
-                        new SecondaryDrawerItem().withName("News"),
-                        new SecondaryDrawerItem().withName("Settings"),
-                        new SecondaryDrawerItem().withName("About").withIdentifier(ABOUT)
-
-                )
-                .withHeader(sidebarHeaderView)
-                .withStickyFooterDivider(false)
-                .withStickyFooter(R.layout.sidebar_sticky_footer)
-                .withOnDrawerItemClickListener(new Drawer.OnDrawerItemClickListener() {
-                    @Override
-                    public boolean onItemClick(AdapterView<?> parent, View view, int position, long id, IDrawerItem drawerItem) {
-                        // do something with the clicked item :D
-
-                        switch (drawerItem.getIdentifier()) {
-                            case ABOUT:
-                                startActivity(new Intent(MainActivityNew.this, AboutActivity.class));
-
-                                return false;
-                        }
-
-                        return true;
-                    }
-                })
-
-                .build();
-
-        final android.content.Context context = getApplicationContext();
-
-        filterDrawer = new DrawerBuilder()
-                .withActivity(this)
-                .withOnDrawerItemLongClickListener(new Drawer.OnDrawerItemLongClickListener() {
-                    @Override
-                    public boolean onItemLongClick(AdapterView<?> adapterView, View view, int i, long l, IDrawerItem iDrawerItem) {
-                        Toast toast = Toast.makeText(context, "Long Pressed", Toast.LENGTH_LONG);
-
-                        toast.show();
-
-                        return true;
-                    }
-                })
-                .withDrawerGravity(Gravity.RIGHT)
-                .append(drawer);
-
-
-        viewPager = materialViewPager.getViewPager();
-        viewPager.setOffscreenPageLimit(6);
-
-
-
-
-        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {}
-
-            @Override
-            public void onPageSelected(int position) {
-
-                Log.d("PageSelected", "P=" + position);
-
-                RecyclerViewFragment fragment = ViewFragmentsDictionary.get(position);
-
-                if (fragment == null || fragment.mRecyclerView == null)
-                    return;
-
-                // fragment.mRecyclerView.smoothScrollToPosition(r.nextInt(fragment.mRecyclerView.getAdapter().getItemCount()));
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-
-            }
-        });
-        materialViewPager.getViewPager().setCurrentItem(1);
-
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        this.mAPIHelper = new APIHelper(this, hostConfig);
-
-        mAPIHelper.retrieveUser(new HabitRPGUserCallback(this));
-    }
-
-    public void FillTasks()
-    {
-        android.support.v4.app.FragmentManager fragmentManager = getSupportFragmentManager();
-
-        viewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) {
-
-            int oldPosition = -1;
-
-            @Override
-            public Fragment getItem(int position) {
-                int layoutOfType;
-                RecyclerViewFragment fragment;
-
-                String fragmentkey = "Recycler$" + position;
-
-                switch (position) {
-                    case 0:
-                        layoutOfType = R.layout.habit_item_card;
-                        fragment = RecyclerViewFragment.newInstance(new HabitItemRecyclerViewAdapter(User.getHabits(), layoutOfType, HabitItemRecyclerViewAdapter.HabitViewHolder.class), fragmentkey);
-                        break;
-                    case 1:
-                        layoutOfType = R.layout.daily_item_card;
-                        fragment = RecyclerViewFragment.newInstance(new HabitItemRecyclerViewAdapter(User.getDailys(), layoutOfType, HabitItemRecyclerViewAdapter.DailyViewHolder.class), fragmentkey);
-                        break;
-                    case 3:
-                        layoutOfType = R.layout.reward_item_card;
-                        fragment = RecyclerViewFragment.newInstance(new HabitItemRecyclerViewAdapter(User.getRewards(), layoutOfType, HabitItemRecyclerViewAdapter.RewardViewHolder.class), fragmentkey);
-                        break;
-                    default:
-                        layoutOfType = R.layout.todo_item_card;
-                        fragment = RecyclerViewFragment.newInstance(new HabitItemRecyclerViewAdapter(User.getTodos(), layoutOfType, HabitItemRecyclerViewAdapter.TodoViewHolder.class), fragmentkey);
-                }
-
-                // ViewFragmentsDictionary.put(position, fragment);
-
-                return fragment;
-            }
-
-            @Override
-            public void setPrimaryItem(ViewGroup container, int position, Object object) {
-                super.setPrimaryItem(container, position, object);
-
-                //only if position changed
-                if (position == oldPosition)
-                    return;
-                oldPosition = position;
-
-                int color = 0;
-                String imageUrl = "";
-                switch (position % 4) {
-                    case 0:
-                        imageUrl = "http://cdn1.tnwcdn.com/wp-content/blogs.dir/1/files/2014/06/wallpaper_51.jpg";
-                        color = getResources().getColor(R.color.blue);
-                        break;
-                    case 1:
-                        imageUrl = "https://fs01.androidpit.info/a/63/0e/android-l-wallpapers-630ea6-h900.jpg";
-                        color = getResources().getColor(R.color.green);
-                        break;
-                    case 2:
-                        imageUrl = "http://www.droid-life.com/wp-content/uploads/2014/10/lollipop-wallpapers10.jpg";
-                        color = getResources().getColor(R.color.cyan);
-                        break;
-                    case 3:
-                        imageUrl = "http://www.tothemobile.com/wp-content/uploads/2014/07/original.jpg";
-                        color = getResources().getColor(R.color.red);
-                        break;
-                }
-
-                final int fadeDuration = 400;
-                //materialViewPager.setImageUrl(imageUrl, fadeDuration);
-                materialViewPager.setColor(color, fadeDuration);
-
-            }
-
-            @Override
-            public int getCount() {
-                return 4;
-            }
-
-            @Override
-            public CharSequence getPageTitle(int position) {
-                switch (position) {
-                    case 0:
-                        return "Habits";
-                    case 1:
-                        return "Dailies";
-                    case 2:
-                        return "Todos";
-                    case 3:
-                        return "Rewards";
-             /*       case 4:
-                        return "Skills";
-
-                    case 5:
-                        return "Skills 2";*/
-                }
-                return "";
-            }
-
-
-        });
-
-        materialViewPager.getPagerTitleStrip().setViewPager(viewPager);
-    }
-
-    public void FillTagFilterDrawer() {
-        filterDrawer.removeAllItems();
-        filterDrawer.addItems(
-                new SectionDrawerItem().withName("Filter by Tag"),
-                new EditTextDrawer()
-
-        );
-
-        for (Tag t : User.getTags()) {
-            filterDrawer.addItem(
-                    new PrimaryDrawerItem().withName(t.getName()).withBadge("" + CountTagUsedInTasks(t.getId()))
-            );
-        }
-
-
-    }
-
-    /**
-     * Anyone a better solution to count the Tag?
-     */
-    public int CountTagUsedInTasks(String tagId) {
-        int count = 0;
-
-        for (HabitItem task : TaskList) {
-            if (task.getTags().contains(tagId))
-                count++;
-        }
-
-        return count;
-    }
-
-    public int adjustAlpha(int color, float factor) {
-        int alpha = Math.round(Color.alpha(color) * factor);
-        int red = Color.red(color);
-        int green = Color.green(color);
-        int blue = Color.blue(color);
-        return Color.argb(alpha, red, green, blue);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.menu_main_activity_new, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        int id = item.getItemId();
-
-        switch (id) {
-            case R.id.action_search:
-                filterDrawer.openDrawer();
-
-                return true;
-            case R.id.action_toggle_sleep:
-                mAPIHelper.toggleSleep(this);
-
-                User.getPreferences().setSleep(!User.getPreferences().isSleep());
-
-                updateUserAvatars();
-
-                return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void updateUserAvatars()
-    {
-        avatarInSidebar.UpdateData(User);
-        avatarInHeader.UpdateData(User);
-    }
-
-    @Override
-    public void onUserReceived(HabitRPGUser user) {
-        TaskList.clear();
-
-        User = user;
-
-        if(user == null)
-            return;
-
-        toolbar.setTitle(User.getProfile().getName() + " - Lv" + User.getStats().getLvl());
-
-        TaskList.addAll(User.getHabits());
-        TaskList.addAll(User.getDailys());
-        TaskList.addAll(User.getTodos());
-        TaskList.addAll(User.getRewards());
-
-        new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-
-                FillTasks();
-
-                updateUserAvatars();
-
-                android.support.v7.app.ActionBarDrawerToggle actionBarDrawerToggle = drawer.getActionBarDrawerToggle();
-
-                if (actionBarDrawerToggle != null) {
-                    actionBarDrawerToggle.setDrawerIndicatorEnabled(true);
-                }
-
-                sidebarHeaderBinding.setUserName(User.getProfile().getName() + " - Lv" + User.getStats().getLvl());
-
-                Double goldPoints = User.getStats().getGp();
-
-                sidebarHeaderBinding.setGold("" + goldPoints.intValue());
-                sidebarHeaderBinding.setSilver("" + (int) ((goldPoints - goldPoints.intValue()) * 100));
-
-                FillTagFilterDrawer();
-            }
-        }, 100);
-    }
-
-    @Override
-    public void onUserFail() {
-
-    }
-
-    @Override
-    public void success(Void aVoid, Response response) {
-
-    }
-
-    @Override
-    public void failure(RetrofitError error) {
-
-    }
-}
\ No newline at end of file
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/CardFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/CardFragment.java
index f3637460b..5f1de7b35 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/CardFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/CardFragment.java
@@ -266,7 +266,7 @@ public abstract class CardFragment extends Fragment implements OnTasksChanged {
 					if(v.getParent()!=null) {
 						String direction = upOrDown(v, getItem(((View) v.getParent()).getId()));
 						String id = getIdString(((View) v.getParent()).getId());
-                        ((MainActivity) getActivity()).onPreResult();
+                        /*((MainActivityOld) getActivity()).onPreResult();*/
                         Log.d("OMG", "id : " + id + " - " + direction);
 						mAPIHelper.updateTaskDirection(id,direction, new TaskScoringCallback((MainActivity) getActivity()));
 					} else {
@@ -391,7 +391,7 @@ public abstract class CardFragment extends Fragment implements OnTasksChanged {
 					return true;
 				case R.id.deleteConfirmMenuBT:
 					HabitItem taskToDel = mAdapter.getItem(mAdapter.getItemCheckedPos());
-                    ((MainActivity) getActivity()).onPreResult();
+                    //((MainActivity) getActivity()).onPreResult();
 					mAPIHelper.deleteTask(taskToDel, new TaskDeletionCallback((MainActivity) getActivity(), taskToDel));
 					mActionMode.finish();
 					return true;