diff --git a/Habitica/res/layout/activity_setup.xml b/Habitica/res/layout/activity_setup.xml
index 5eb83565f..6bfe64afc 100644
--- a/Habitica/res/layout/activity_setup.xml
+++ b/Habitica/res/layout/activity_setup.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent" android:layout_height="match_parent">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent" android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <com.habitrpg.android.habitica.ui.views.FadingViewPager
         android:id="@+id/viewPager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/bottomBar" />
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
 
     <RelativeLayout
         android:id="@+id/bottomBar"
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"
         android:background="@color/background_brand"
         android:gravity="center_vertical"
         android:elevation="8dp">
+        <com.viewpagerindicator.IconPageIndicator
+            android:id="@+id/view_pager_indicator"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true" />
         <Button
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -27,8 +29,7 @@
             android:drawableStart="@drawable/back_arrow_disabled"
             android:background="@color/transparent"
             android:drawablePadding="12dp"
-            android:textColor="@color/white"
-            android:layout_alignParentStart="true"/>
+            android:textColor="@color/white"/>
         <Button
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -39,11 +40,5 @@
             android:drawableEnd="@drawable/forward_arrow_enabled"
             android:background="@color/transparent"
             android:layout_alignParentEnd="true"/>
-
-        <com.viewpagerindicator.IconPageIndicator
-            android:id="@+id/view_pager_indicator"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true" />
     </RelativeLayout>
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
index b2b71a674..21735ef76 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
@@ -159,7 +159,7 @@ class UserRepositoryImpl(
         val unlockResponse = apiClient.unlockPath(path) ?: return null
         val user = localRepository.getUser(userID).firstOrNull() ?: return unlockResponse
         localRepository.modify(user) { liveUser ->
-            liveUser.preferences = unlockResponse.preferences
+            unlockResponse.preferences?.let { liveUser.preferences = it }
             liveUser.purchased = unlockResponse.purchased
             liveUser.items = unlockResponse.items
             liveUser.balance = liveUser.balance - (price / 4.0)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt
index 673da4f21..e5ccbfe96 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt
@@ -81,6 +81,6 @@ object MainNavigationController {
     }
 
     fun navigateBack() {
-        navController?.popBackStack()
+        navController?.navigateUp()
     }
 }