diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 7e05a0c26..293ac1f82 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -148,7 +148,7 @@ android {
         buildConfigField "String", "STORE", "\"google\""
         multiDexEnabled true
 
-        versionCode 2055
+        versionCode 2057
         versionName "1.7"
     }
 
diff --git a/Habitica/res/layout/challenge_item.xml b/Habitica/res/layout/challenge_item.xml
index 11e82367c..df6022c6e 100644
--- a/Habitica/res/layout/challenge_item.xml
+++ b/Habitica/res/layout/challenge_item.xml
@@ -66,25 +66,26 @@
             android:textSize="12sp"
             tools:text="Description"
             android:layout_marginTop="@dimen/spacing_small"
-            android:layout_marginBottom="@dimen/spacing_medium"/>
+            android:layout_marginBottom="@dimen/spacing_small"/>
 
         <LinearLayout
             android:id="@+id/leaderParticipantLayout"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
             <ImageView
                 android:layout_width="18dp"
-                android:layout_height="match_parent"
+                android:layout_height="20dp"
                 android:src="@drawable/dialogue_participants" />
 
             <TextView
                 android:id="@+id/participantCount"
                 style="@style/ChallengeTaskDetails"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="20dp"
                 android:layout_marginLeft="4dp"
                 android:layout_marginStart="4dp"
+                android:gravity="center_vertical"
                 tools:text="12334" />
             <TextView
                 android:id="@+id/official_challenge_view"
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index fdb646633..8daf946d8 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -135,7 +135,7 @@
     <dimen name="header_border_spacing">16dp</dimen>
     <dimen name="login_field_width">300dp</dimen>
 
-    <dimen name="bb_height">60dp</dimen>
+    <dimen name="bb_height">65dp</dimen>
     <dimen name="bb_default_elevation">8dp</dimen>
     <dimen name="bb_fake_shadow_height">4dp</dimen>
 </resources>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 9f30c1093..5f2ef75b4 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -855,5 +855,6 @@
     <string name="gift_confirmation_title">Your gift was sent!</string>
     <string name="gift_confirmation_text_g1g1">Your gifted subscription was sent and your subscription applied to your account.</string>
     <string name="gift_confirmation_text">Your gifted subscription was sent and your subscription applied to your account.</string>
+    <string name="discover">Discover</string>
 
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
index 341343be2..b3f83f80f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
@@ -31,9 +31,6 @@ import io.reactivex.functions.Consumer
 import io.realm.RealmResults
 import javax.inject.Inject
 import javax.inject.Named
-import android.widget.Toast
-import com.habitrpg.android.habitica.R.id.recyclerView
-
 
 
 class ChallengeListFragment : BaseFragment(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
@@ -120,6 +117,8 @@ class ChallengeListFragment : BaseFragment(), androidx.swiperefreshlayout.widget
     }
 
     override fun onRefresh() {
+        nextPageToLoad = 0
+        loadedAllData = false
         retrieveChallengesPage()
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt
index c2830a7d4..288b44a7b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt
@@ -61,12 +61,10 @@ class ChallengesOverviewFragment : BaseMainFragment() {
         statePagerAdapter = object : FragmentStatePagerAdapter(fragmentManager) {
 
             override fun getItem(position: Int): androidx.fragment.app.Fragment? {
-                val fragment = Fragment()
-
-                return when (position) {
-                    0 -> userChallengesFragment
-                    1 -> availableChallengesFragment
-                    else -> fragment
+                return if (position == 0) {
+                    userChallengesFragment
+                } else {
+                    availableChallengesFragment
                 }
             }
 
@@ -77,7 +75,7 @@ class ChallengesOverviewFragment : BaseMainFragment() {
             override fun getPageTitle(position: Int): CharSequence? {
                 return when (position) {
                     0 -> getString(R.string.my_challenges)
-                    1 -> getString(R.string.public_challenges)
+                    1 -> getString(R.string.discover)
                     else -> ""
                 }
             }