diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml
index 87046e954..8fb24c4f6 100644
--- a/Habitica/res/layout/activity_main.xml
+++ b/Habitica/res/layout/activity_main.xml
@@ -160,7 +160,7 @@
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/navigation_drawer"
         class="com.habitrpg.android.habitica.ui.fragments.NavigationDrawerFragment"
-        android:layout_width="match_parent"
+        android:layout_width="@dimen/drawer_width"
         android:layout_height="match_parent"
         android:layout_gravity="start"
         tools:layout="@layout/drawer_main"/>
diff --git a/Habitica/res/values-w420dp/dimens.xml b/Habitica/res/values-w420dp/dimens.xml
new file mode 100644
index 000000000..f679fcb2e
--- /dev/null
+++ b/Habitica/res/values-w420dp/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="drawer_width">380dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index ad847cc41..e60c9e39c 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -108,4 +108,6 @@
     <dimen name="task_spacing_horizontal">10dp</dimen>
     <dimen name="bottom_sheet_radius">20dp</dimen>
     <dimen name="bottom_sheet_inset">16dp</dimen>
+    <!-- this is equivalent to match_parent -->
+    <dimen name="drawer_width">-1px</dimen>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
index fa444d521..c3b7ed569 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
@@ -9,9 +9,6 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.AdventureGuideMenuBannerBinding
-import com.habitrpg.common.habitica.extensions.dpToPx
-import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.common.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.user.User
@@ -19,6 +16,9 @@ import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder
 import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.common.habitica.extensions.dpToPx
+import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.common.habitica.models.responses.TaskDirection
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.functions.Action
@@ -40,7 +40,7 @@ abstract class RealmBaseTasksRecyclerViewAdapter(
     override var user: User? = null
         set(value) {
             field = value
-            notifyItemChanged(0)
+            notifyDataSetChanged()
         }
 
     override var taskDisplayMode: String = "standard"
@@ -92,7 +92,16 @@ abstract class RealmBaseTasksRecyclerViewAdapter(
     }
 
     override fun getItemCount(): Int {
-        return data.size
+        return data.size + if (showAdventureGuide) 1 else 0
+    }
+
+    override fun getItem(position: Int): Task? {
+        if (showAdventureGuide && position == 0) {
+            return null
+        } else if (showAdventureGuide) {
+            return super.getItem(position - 1)
+        }
+        return super.getItem(position)
     }
 
     override fun getItemViewType(position: Int): Int {
diff --git a/fastlane/changelog.txt b/fastlane/changelog.txt
index a4df27df5..42df38afd 100644
--- a/fastlane/changelog.txt
+++ b/fastlane/changelog.txt
@@ -1,11 +1,11 @@
-- New unsaved changes warning for tasks
-- New design for the Gem screen
-- New design for Starting Objectives
-- New private messages will show without needing to scroll
-- Purchased Backgrounds show correctly
-- Fixes Armoire error when you don’t have enough Gold
-- Fixes issue where the wrong task filters would show sometimes
-- Gift subs can be properly selected
-- Ended Challenges will go away properly
-- External links work in Guilds
-- Proper 12h/24h support
+What’s new in version 4.0:
+-Habitica has a brand new WearOS app for smart watches!
+-Newly designed Backgrounds section
+-Ability to filter, preview, and pin Backgrounds
+-New bottom sheet designs in Items, Pets & Mounts, and Filters
+-New Day Start Adjustment interface
+-Improvements to task reminder reliability
+-Improvements to payment and subscription handling
+-Fixes account deletion confirmation prompt
+-Fixes task reorder bug for new accounts
+-Fixes sprite size in Quest Details preview