diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java
index 39d651d3..49651963 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java
@@ -51,14 +51,20 @@ public class HomeFragment extends Fragment {
         homeViewModel = new ViewModelProvider(requireActivity()).get(HomeViewModel.class);
 
         init();
+
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
         initDiscoverSongSlideView();
         initMostPlayedSongView();
         initRecentPlayedSongView();
         initFavoritesSongView();
         initYearSongView();
         initRecentAddedSongView();
-
-        return view;
     }
 
     @Override
@@ -116,7 +122,7 @@ public class HomeFragment extends Fragment {
         mostPlayedMusicAdapter = new RecentMusicAdapter(activity, requireContext(), getChildFragmentManager());
         bind.mostPlayedTracksRecyclerView.setAdapter(mostPlayedMusicAdapter);
         homeViewModel.getMostPlayedSongList().observe(requireActivity(), songs -> {
-            if(songs.isEmpty()) reorder();
+            if(songs.size() < 10) reorder();
 
             bind.homeMostPlayedTracksSector.setVisibility(!songs.isEmpty() ? View.VISIBLE : View.GONE);
             mostPlayedMusicAdapter.setItems(songs);
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/LibraryFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/LibraryFragment.java
index 79b16e39..8ae01849 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/LibraryFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/LibraryFragment.java
@@ -47,13 +47,19 @@ public class LibraryFragment extends Fragment {
         libraryViewModel = new ViewModelProvider(requireActivity()).get(LibraryViewModel.class);
 
         init();
+
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
         initAlbumView();
         initArtistView();
         initGenreView();
         initPlaylistView();
         initCatalogueSyncCheck();
-
-        return view;
     }
 
     @Override
@@ -104,7 +110,9 @@ public class LibraryFragment extends Fragment {
             activity.navController.navigate(R.id.action_libraryFragment_to_songListPageFragment, bundle);
         });
         bind.genreRecyclerView.setAdapter(genreAdapter);
-        libraryViewModel.getGenreSample().observe(requireActivity(), genres -> genreAdapter.setItems(genres));
+        libraryViewModel.getGenreSample().observe(requireActivity(), genres -> {
+            genreAdapter.setItems(genres);
+        });
     }
 
     private void initPlaylistView() {
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index d06fcbe1..7e57ba7c 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -139,6 +139,7 @@
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/library_genres_sector"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"