diff --git a/app/src/main/java/com/aurora/store/ui/category/fragment/SubCategoryFragment.java b/app/src/main/java/com/aurora/store/ui/category/fragment/SubCategoryFragment.java
index 78adf244a..11ed35525 100644
--- a/app/src/main/java/com/aurora/store/ui/category/fragment/SubCategoryFragment.java
+++ b/app/src/main/java/com/aurora/store/ui/category/fragment/SubCategoryFragment.java
@@ -117,9 +117,7 @@ public class SubCategoryFragment extends BaseFragment implements
         setupRecycler();
 
         model = new ViewModelProvider(this).get(CategoryAppsModel.class);
-        model.getCategoryApps().observe(getViewLifecycleOwner(), appList -> {
-            dispatchAppsToAdapter(appList);
-        });
+        model.getCategoryApps().observe(getViewLifecycleOwner(), this::dispatchAppsToAdapter);
         model.fetchCategoryApps(CategoryAppsActivity.categoryId, getSubcategory(), false);
     }
 
diff --git a/app/src/main/java/com/aurora/store/ui/details/DetailsActivity.java b/app/src/main/java/com/aurora/store/ui/details/DetailsActivity.java
index 9685f2494..6725ee6ad 100644
--- a/app/src/main/java/com/aurora/store/ui/details/DetailsActivity.java
+++ b/app/src/main/java/com/aurora/store/ui/details/DetailsActivity.java
@@ -62,6 +62,7 @@ import com.aurora.store.ui.single.activity.BaseActivity;
 import com.aurora.store.ui.single.activity.DownloadsActivity;
 import com.aurora.store.ui.single.activity.ManualDownloadActivity;
 import com.aurora.store.ui.view.ViewFlipper2;
+import com.aurora.store.util.Accountant;
 import com.aurora.store.util.ContextUtil;
 import com.aurora.store.util.Log;
 import com.aurora.store.util.PackageUtil;
diff --git a/app/src/main/res/layout/activity_category_apps.xml b/app/src/main/res/layout/activity_category_apps.xml
index 86f7fb9ee..3ec0e6db5 100644
--- a/app/src/main/res/layout/activity_category_apps.xml
+++ b/app/src/main/res/layout/activity_category_apps.xml
@@ -4,27 +4,34 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/search_bar" />
-
-    <fragment
-        android:id="@+id/nav_host_category"
-        android:name="androidx.navigation.fragment.NavHostFragment"
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:defaultNavHost="true"
-        app:navGraph="@navigation/nav_graph_category" />
+        android:layout_height="match_parent">
 
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/bottom_navigation"
-        style="@style/Widget.Aurora.BottomNavigation"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        app:backgroundTint="?android:colorBackground"
-        app:elevation="6dp"
-        app:itemTextAppearanceActive="@style/TextAppearance.Aurora.BottomNav.Active"
-        app:itemTextAppearanceInactive="@style/TextAppearance.Aurora.BottomNav.Inactive"
-        app:menu="@menu/navigation_category" />
+        <include layout="@layout/search_bar" />
+
+        <fragment
+            android:id="@+id/nav_host_category"
+            android:name="androidx.navigation.fragment.NavHostFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@+id/search_bar"
+            app:defaultNavHost="true"
+            app:navGraph="@navigation/nav_graph_category" />
+
+        <com.google.android.material.bottomnavigation.BottomNavigationView
+            android:id="@+id/bottom_navigation"
+            style="@style/Widget.Aurora.BottomNavigation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_gravity="bottom"
+            app:backgroundTint="?android:colorBackground"
+            app:elevation="6dp"
+            app:itemTextAppearanceActive="@style/TextAppearance.Aurora.BottomNav.Active"
+            app:itemTextAppearanceInactive="@style/TextAppearance.Aurora.BottomNav.Inactive"
+            app:menu="@menu/navigation_category" />
+    </RelativeLayout>
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/filter_fab"
diff --git a/app/src/main/res/layout/fragment_category_applist.xml b/app/src/main/res/layout/fragment_category_applist.xml
index b7e62d765..319a3d263 100644
--- a/app/src/main/res/layout/fragment_category_applist.xml
+++ b/app/src/main/res/layout/fragment_category_applist.xml
@@ -27,7 +27,6 @@
         android:id="@+id/view_flipper"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@id/layout_top"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
         <com.aurora.store.ui.view.placeholder.ProgressView
diff --git a/app/src/main/res/layout/search_bar.xml b/app/src/main/res/layout/search_bar.xml
index 8dd889e25..bef9d5a6d 100644
--- a/app/src/main/res/layout/search_bar.xml
+++ b/app/src/main/res/layout/search_bar.xml
@@ -21,6 +21,7 @@
 <com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/Widget.AppBar"
+    android:id="@+id/search_bar"
     android:layout_width="match_parent"
     android:layout_height="?actionBarSize"
     android:translationZ="1dp"