diff --git a/app/src/main/java/ani/dantotsu/profile/activity/FeedFragment.kt b/app/src/main/java/ani/dantotsu/profile/activity/FeedFragment.kt
index cd11a3d3..40c96829 100644
--- a/app/src/main/java/ani/dantotsu/profile/activity/FeedFragment.kt
+++ b/app/src/main/java/ani/dantotsu/profile/activity/FeedFragment.kt
@@ -50,22 +50,21 @@ class FeedFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         activity = requireActivity()
 
-
-
-        binding.listRecyclerView.adapter = adapter
-        binding.listRecyclerView.layoutManager =
-            LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
-        binding.listProgressBar.visibility = ViewGroup.VISIBLE
         userId = arguments?.getInt("userId", -1)
         activityId = arguments?.getInt("activityId", -1) ?: -1
         if (userId == -1) userId = null
         global = arguments?.getBoolean("global", false) ?: false
 
-        if (userId != null) {
-            binding.listRecyclerView.setBaseline((activity as ProfileActivity).navBar)
-        }else{
-            binding.listRecyclerView.setBaseline((activity as FeedActivity).navBar)
-        }
+        val navBar = if (userId != null)
+                (activity as ProfileActivity).navBar
+        else
+                (activity as FeedActivity).navBar
+        binding.listRecyclerView.setBaseline(navBar)
+
+        binding.listRecyclerView.adapter = adapter
+        binding.listRecyclerView.layoutManager =
+            LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
+        binding.listProgressBar.visibility = ViewGroup.VISIBLE
     }
 
     @SuppressLint("ClickableViewAccessibility")
@@ -73,11 +72,11 @@ class FeedFragment : Fragment() {
         super.onResume()
         if (this::binding.isInitialized) {
             binding.root.requestLayout()
-            if (userId != null) {
-                binding.listRecyclerView.setBaseline((activity as ProfileActivity).navBar)
-            }else{
-                binding.listRecyclerView.setBaseline((activity as FeedActivity).navBar)
-            }
+            val navBar = if (userId != null)
+                (activity as ProfileActivity).navBar
+            else
+                (activity as FeedActivity).navBar
+            binding.listRecyclerView.setBaseline(navBar)
             if (!loadedFirstTime) {
                 activity.lifecycleScope.launch(Dispatchers.IO) {
                     val nulledId = if (activityId == -1) null else activityId