diff --git a/app/build.gradle b/app/build.gradle
index 3e81b904..e0d766c3 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 29
 
-        versionCode 54
-        versionName '19.0.2'
+        versionCode 55
+        versionName '19.0.3'
 
         multiDexEnabled true
 
diff --git a/app/src/main/java/awais/instagrabber/fragments/FollowViewerFragment.java b/app/src/main/java/awais/instagrabber/fragments/FollowViewerFragment.java
index 4da57ca4..260b5da5 100644
--- a/app/src/main/java/awais/instagrabber/fragments/FollowViewerFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/FollowViewerFragment.java
@@ -249,8 +249,8 @@ public final class FollowViewerFragment extends Fragment implements SwipeRefresh
         loading = true;
         setSubtitle(R.string.followers_compare);
         allFollowing.clear();
-        binding.swipeRefreshLayout.setRefreshing(true);
         if (moreAvailable) {
+            binding.swipeRefreshLayout.setRefreshing(true);
             Toast.makeText(getContext(), R.string.follower_start_compare, Toast.LENGTH_LONG).show();
             friendshipService.getList(isFollowersList,
                     profileId,
@@ -258,6 +258,7 @@ public final class FollowViewerFragment extends Fragment implements SwipeRefresh
                     isFollowersList ? followersFetchCb : followingFetchCb);
         }
         else if (followersModels.size() == 0 || followingModels.size() == 0) {
+            binding.swipeRefreshLayout.setRefreshing(true);
             Toast.makeText(getContext(), R.string.follower_start_compare, Toast.LENGTH_LONG).show();
             friendshipService.getList(!isFollowersList,
                     profileId,
diff --git a/app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java b/app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java
index 8739f0c9..ad38dbb2 100644
--- a/app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java
+++ b/app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java
@@ -27,6 +27,8 @@ import awais.instagrabber.models.enums.RavenExpiringMediaType;
 import awais.instagrabber.models.enums.RavenMediaViewType;
 import awaisomereport.LogCollector;
 
+import static awais.instagrabber.utils.Utils.settingsHelper;
+
 public final class ResponseBodyUtils {
     private static final String TAG = "ResponseBodyUtils";
 
@@ -261,7 +263,10 @@ public final class ResponseBodyUtils {
         final String threadPrevCursor = data.has("prev_cursor") ? data.getString("prev_cursor") : null;
 
         final boolean threadHasOlder = data.getBoolean("has_older");
-        final long unreadCount = data.optLong("read_state", 0);
+
+        final String cookie = settingsHelper.getString(Constants.COOKIE);
+        final String userIdFromCookie = CookieUtils.getUserIdFromCookie(cookie);
+        final long unreadCount = data.getJSONObject("last_seen_at").getJSONObject(userIdFromCookie).getString("item_id").equals(threadNewestCursor) ? 0 : 1;
 
         final long lastActivityAt = data.optLong("last_activity_at");
         final boolean named = data.optBoolean("named");
diff --git a/app/src/main/res/layout/dialog_post_layout_preferences.xml b/app/src/main/res/layout/dialog_post_layout_preferences.xml
index 7bf0eefc..43f49b1d 100644
--- a/app/src/main/res/layout/dialog_post_layout_preferences.xml
+++ b/app/src/main/res/layout/dialog_post_layout_preferences.xml
@@ -21,11 +21,14 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/label_layout"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginRight="6dp"
+            android:gravity="right"
             android:text="@string/layout_style"
             app:layout_constraintBottom_toBottomOf="@id/layout_toggle"
             app:layout_constraintEnd_toStartOf="@id/guideline"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/layout_toggle" />
 
         <!-- Button icons do not appear in preview, but will appear
@@ -67,9 +70,12 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/label_col_count"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginRight="6dp"
+            android:gravity="right"
             android:text="@string/column_count"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintBottom_toBottomOf="@id/col_count_toggle"
             app:layout_constraintEnd_toStartOf="@id/guideline"
             app:layout_constraintTop_toTopOf="@id/col_count_toggle" />
@@ -104,11 +110,14 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/label_show_names_toggle"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginRight="6dp"
+            android:gravity="right"
             android:text="@string/show_names"
             app:layout_constraintBottom_toBottomOf="@id/show_names_toggle"
             app:layout_constraintEnd_toStartOf="@id/guideline"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/show_names_toggle" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
@@ -116,6 +125,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:checked="true"
+
             app:layout_constraintBottom_toTopOf="@id/show_avatar_toggle"
             app:layout_constraintStart_toEndOf="@id/guideline"
             app:layout_constraintTop_toBottomOf="@id/col_count_toggle"
@@ -125,9 +135,12 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/label_show_avatar_toggle"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginRight="6dp"
+            android:gravity="right"
             android:text="@string/show_avatars"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintBottom_toBottomOf="@id/show_avatar_toggle"
             app:layout_constraintEnd_toStartOf="@id/guideline"
             app:layout_constraintTop_toTopOf="@id/show_avatar_toggle" />
@@ -146,9 +159,12 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/label_avatar_size"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginRight="6dp"
+            android:gravity="right"
             android:text="@string/avatar_size"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintBottom_toBottomOf="@id/avatar_size_toggle"
             app:layout_constraintEnd_toStartOf="@id/guideline"
             app:layout_constraintTop_toTopOf="@id/avatar_size_toggle" />
@@ -190,9 +206,12 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/label_corners"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginRight="6dp"
+            android:gravity="right"
             android:text="@string/corners"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintBottom_toBottomOf="@id/corners_toggle"
             app:layout_constraintEnd_toStartOf="@id/guideline"
             app:layout_constraintTop_toTopOf="@id/corners_toggle" />
@@ -227,9 +246,12 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/label_gap"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginRight="6dp"
+            android:gravity="right"
             android:text="@string/show_grid_gap"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintBottom_toBottomOf="@id/show_gap_toggle"
             app:layout_constraintEnd_toStartOf="@id/guideline"
             app:layout_constraintTop_toTopOf="@id/show_gap_toggle" />
@@ -248,9 +270,13 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/label_disable_animation"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="@string/disable_animation"
+            android:layout_marginRight="6dp"
+            android:gravity="right"
+           android:text="@string/disable_animation"
+            android:layout_gravity="right"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintBottom_toBottomOf="@id/disable_animation_toggle"
             app:layout_constraintEnd_toStartOf="@id/guideline"
             app:layout_constraintTop_toTopOf="@id/disable_animation_toggle" />