diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index c098e5caf..74ff962d4 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -131,8 +131,8 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.0.1'
     implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
     kapt "androidx.lifecycle:lifecycle-compiler:2.0.0"
-    implementation 'android.arch.navigation:navigation-fragment-ktx:1.0.0-alpha07'
-    implementation 'android.arch.navigation:navigation-ui-ktx:1.0.0-alpha07'
+    implementation 'android.arch.navigation:navigation-fragment-ktx:1.0.0-alpha08'
+    implementation 'android.arch.navigation:navigation-ui-ktx:1.0.0-alpha08'
     implementation 'com.plattysoft.leonids:LeonidsLib:1.3.2'
 }
 
@@ -142,12 +142,13 @@ android {
 
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 16
         applicationId "com.habitrpg.android.habitica"
+        vectorDrawables.useSupportLibrary = true
         buildConfigField "String", "STORE", "\"google\""
         multiDexEnabled true
 
-        versionCode 2042
+        versionCode 2043
         versionName "1.7"
     }
 
diff --git a/Habitica/res/layout/dialog_edittext.xml b/Habitica/res/layout/dialog_edittext.xml
new file mode 100644
index 000000000..ea54ddb1b
--- /dev/null
+++ b/Habitica/res/layout/dialog_edittext.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="@dimen/spacing_medium">
+    <EditText
+        android:id="@+id/editText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="text" />
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 0bf1e2453..547e09c1a 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -491,6 +491,7 @@
     <string name="payment_method">Payment method</string>
     <string name="subscription">Subscription</string>
     <string name="active">Active</string>
+    <string name="due">Due</string>
     <string name="cancel_subscription">Cancel Subscription</string>
     <string name="cancel_subscription_google.description">No longer want to subscribe? You can find the option to unsubscribe in the “My Apps” section of the Google Play Store.</string>
     <string name="cancel_subscription_notgoogle.description">No longer want to subscribe? Due to your payment method, you can only unsubscribe through the website. Click the button below, to open the site in your browser!</string>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
index 7ee045e5c..f1da145a4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
@@ -15,7 +15,6 @@ import com.habitrpg.android.habitica.receivers.NotificationPublisher
 import com.habitrpg.android.habitica.receivers.TaskReceiver
 import io.reactivex.Flowable
 import io.reactivex.functions.Consumer
-import org.greenrobot.eventbus.EventBus
 import java.util.*
 
 class TaskAlarmManager(private var context: Context, private var taskRepository: TaskRepository, private var userId: String) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
index 92419a81c..b407b0cdc 100755
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
@@ -243,7 +243,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         this.keyboardUtil?.enable()
 
         val navigationController = findNavController(R.id.nav_host_fragment)
-        navigationController.addOnNavigatedListener { _, destination ->
+        navigationController.addOnDestinationChangedListener { _, destination, _ ->
             if (destination.label.isNullOrEmpty()) {
                 toolbarTitleTextView.text = user?.profile?.name
             } else if (user?.profile != null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt
index c3f8175c0..a79e0069e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt
@@ -113,13 +113,12 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() {
 
     private fun showLoginNameDialog() {
         val inflater = context?.layoutInflater
-        val view = inflater?.inflate(R.layout.dialog_edittext_confirm_pw, null)
+        val view = inflater?.inflate(R.layout.dialog_edittext, null)
         val loginNameEditText = view?.findViewById<EditText>(R.id.editText)
         loginNameEditText?.setText(user?.authentication?.localAuthentication?.username)
         context.notNull { context ->
-            var builder = AlertDialog.Builder(context).setTitle(R.string.change_username)
-
-            val dialog = builder.setPositiveButton(R.string.change) { thisDialog, _ ->
+            val builder = AlertDialog.Builder(context).setTitle(R.string.change_username)
+            val dialog = builder.setPositiveButton(R.string.save) { thisDialog, _ ->
                         thisDialog.dismiss()
                         userRepository.updateLoginName(loginNameEditText?.text.toString())
                                 .subscribe(Consumer {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
index b534ce8d3..db8e5e197 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
@@ -210,7 +210,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
             override fun onScrollStateChanged(recyclerView: androidx.recyclerview.widget.RecyclerView, newState: Int) {
                 super.onScrollStateChanged(recyclerView, newState)
                 if (newState == androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE) {
-                    refreshLayout?.isEnabled = (activity as MainActivity).isAppBarExpanded
+                    refreshLayout?.isEnabled = (activity as? MainActivity)?.isAppBarExpanded ?: false
                 }
             }
         })
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
index 970ba38b3..ee40f60b9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
@@ -222,8 +222,8 @@ class TaskFilterDialog(context: Context, component: AppComponent?) : AlertDialog
 
             }
         })
-        val deleteButton = wrapper?.findViewById<View>(R.id.delete_button) as Button
-        deleteButton.setOnClickListener {
+        val deleteButton = wrapper?.findViewById<View>(R.id.delete_button) as? Button
+        deleteButton?.setOnClickListener {
             deletedTags.add(tag.getId())
             if (createdTags.containsKey(tag.getId())) {
                 createdTags.remove(tag.getId())
@@ -276,7 +276,7 @@ class TaskFilterDialog(context: Context, component: AppComponent?) : AlertDialog
             Task.TYPE_DAILY -> {
                 taskTypeTitle.setText(R.string.dailies)
                 allTaskFilter.setText(R.string.all)
-                secondTaskFilter.setText(R.string.active)
+                secondTaskFilter.setText(R.string.due)
                 thirdTaskFilter.setText(R.string.gray)
             }
             Task.TYPE_TODO -> {