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 cc58578a..39d651d3 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
@@ -52,11 +52,11 @@ public class HomeFragment extends Fragment {
 
         init();
         initDiscoverSongSlideView();
-        initRecentAddedSongView();
-        initFavoritesSongView();
-        initYearSongView();
         initMostPlayedSongView();
         initRecentPlayedSongView();
+        initFavoritesSongView();
+        initYearSongView();
+        initRecentAddedSongView();
 
         return view;
     }
@@ -109,13 +109,30 @@ public class HomeFragment extends Fragment {
         setDiscoverSongSlideViewOffset(20, 16);
     }
 
-    private void initRecentAddedSongView() {
-        bind.recentlyAddedTracksRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false));
-        bind.recentlyAddedTracksRecyclerView.setHasFixedSize(true);
+    private void initMostPlayedSongView() {
+        bind.mostPlayedTracksRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false));
+        bind.mostPlayedTracksRecyclerView.setHasFixedSize(true);
 
-        recentlyAddedMusicAdapter = new RecentMusicAdapter(activity, requireContext(), getChildFragmentManager());
-        bind.recentlyAddedTracksRecyclerView.setAdapter(recentlyAddedMusicAdapter);
-        homeViewModel.getRecentlyAddedSongList().observe(requireActivity(), songs -> recentlyAddedMusicAdapter.setItems(songs));
+        mostPlayedMusicAdapter = new RecentMusicAdapter(activity, requireContext(), getChildFragmentManager());
+        bind.mostPlayedTracksRecyclerView.setAdapter(mostPlayedMusicAdapter);
+        homeViewModel.getMostPlayedSongList().observe(requireActivity(), songs -> {
+            if(songs.isEmpty()) reorder();
+
+            bind.homeMostPlayedTracksSector.setVisibility(!songs.isEmpty() ? View.VISIBLE : View.GONE);
+            mostPlayedMusicAdapter.setItems(songs);
+        });
+    }
+
+    private void initRecentPlayedSongView() {
+        bind.recentlyPlayedTracksRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false));
+        bind.recentlyPlayedTracksRecyclerView.setHasFixedSize(true);
+
+        recentlyPlayedMusicAdapter = new RecentMusicAdapter(activity, requireContext(), getChildFragmentManager());
+        bind.recentlyPlayedTracksRecyclerView.setAdapter(recentlyPlayedMusicAdapter);
+        homeViewModel.getRecentlyPlayedSongList().observe(requireActivity(), songs -> {
+            bind.homeRecentlyPlayedTracksSector.setVisibility(!songs.isEmpty() ? View.VISIBLE : View.GONE);
+            recentlyPlayedMusicAdapter.setItems(songs);
+        });
     }
 
     private void initYearSongView() {
@@ -139,7 +156,7 @@ public class HomeFragment extends Fragment {
         favoriteSongAdapter = new SongResultSearchAdapter(activity, requireContext(), getChildFragmentManager());
         bind.favoritesTracksRecyclerView.setAdapter(favoriteSongAdapter);
         homeViewModel.getFavorites().observe(requireActivity(), songs -> {
-            bind.homeFavoriteTracksSector.setVisibility(songs.size() > 0 ? View.VISIBLE : View.GONE);
+            bind.homeFavoriteTracksSector.setVisibility(!songs.isEmpty() ? View.VISIBLE : View.GONE);
             favoriteSongAdapter.setItems(songs);
         });
 
@@ -147,28 +164,13 @@ public class HomeFragment extends Fragment {
         pagerSnapHelper.attachToRecyclerView(bind.favoritesTracksRecyclerView);
     }
 
-    private void initMostPlayedSongView() {
-        bind.mostPlayedTracksRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false));
-        bind.mostPlayedTracksRecyclerView.setHasFixedSize(true);
+    private void initRecentAddedSongView() {
+        bind.recentlyAddedTracksRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false));
+        bind.recentlyAddedTracksRecyclerView.setHasFixedSize(true);
 
-        mostPlayedMusicAdapter = new RecentMusicAdapter(activity, requireContext(), getChildFragmentManager());
-        bind.mostPlayedTracksRecyclerView.setAdapter(mostPlayedMusicAdapter);
-        homeViewModel.getMostPlayedSongList().observe(requireActivity(), songs -> {
-            bind.homeMostPlayedTracksSector.setVisibility(songs.size() > 0 ? View.VISIBLE : View.GONE);
-            mostPlayedMusicAdapter.setItems(songs);
-        });
-    }
-
-    private void initRecentPlayedSongView() {
-        bind.recentlyPlayedTracksRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false));
-        bind.recentlyPlayedTracksRecyclerView.setHasFixedSize(true);
-
-        recentlyPlayedMusicAdapter = new RecentMusicAdapter(activity, requireContext(), getChildFragmentManager());
-        bind.recentlyPlayedTracksRecyclerView.setAdapter(recentlyPlayedMusicAdapter);
-        homeViewModel.getRecentlyPlayedSongList().observe(requireActivity(), songs -> {
-            bind.homeRecentlyPlayedTracksSector.setVisibility(songs.size() > 0 ? View.VISIBLE : View.GONE);
-            recentlyPlayedMusicAdapter.setItems(songs);
-        });
+        recentlyAddedMusicAdapter = new RecentMusicAdapter(activity, requireContext(), getChildFragmentManager());
+        bind.recentlyAddedTracksRecyclerView.setAdapter(recentlyAddedMusicAdapter);
+        homeViewModel.getRecentlyAddedSongList().observe(requireActivity(), songs -> recentlyAddedMusicAdapter.setItems(songs));
     }
 
     private void setDiscoverSongSlideViewOffset(float pageOffset, float pageMargin) {
@@ -185,4 +187,21 @@ public class HomeFragment extends Fragment {
             }
         });
     }
+
+    /*
+     * Il layout di default prevede questa sequenza:
+     * - Discovery - Most_played - Last_played - Year - Favorite - Recently_added
+     *
+     * Se però non ho ancora ascoltato nessuna canzone e quindi Most_played e Last_played sono vuoti, modifico come segue
+     * - Discovery - Recently_added - Year - Favorite - Most_played - Last_played
+     */
+    public void reorder() {
+        bind.homeLinearLayoutContainer.removeAllViews();
+        bind.homeLinearLayoutContainer.addView(bind.homeDiscoverSector);
+        bind.homeLinearLayoutContainer.addView(bind.homeRecentlyAddedTracksSector);
+        bind.homeLinearLayoutContainer.addView(bind.homeFlashbackSector);
+        bind.homeLinearLayoutContainer.addView(bind.homeFavoriteTracksSector);
+        bind.homeLinearLayoutContainer.addView(bind.homeMostPlayedTracksSector);
+        bind.homeLinearLayoutContainer.addView(bind.homeRecentlyPlayedTracksSector);
+    }
 }
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index d98c5134..1f764c68 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -7,6 +7,7 @@
     app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior">
 
     <LinearLayout
+        android:id="@+id/home_linear_layout_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
@@ -14,6 +15,7 @@
 
         <!--  Discover music  -->
         <LinearLayout
+            android:id="@+id/home_discover_sector"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
@@ -40,151 +42,6 @@
                 android:paddingBottom="8dp" />
         </LinearLayout>
 
-        <!--  Recently added tracks -->
-        <LinearLayout
-            android:id="@+id/home_recently_added_tracks_sector"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <!--  Label and button  -->
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingStart="8dp"
-                android:paddingTop="8dp"
-                android:paddingEnd="8dp">
-
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:fontFamily="@font/open_sans_font_family"
-                    android:paddingStart="8dp"
-                    android:paddingTop="12dp"
-                    android:paddingEnd="8dp"
-                    android:text="Recently added"
-                    android:textColor="@color/titleTextColor"
-                    android:textSize="22sp"
-                    android:textStyle="bold" />
-
-
-                <TextView
-                    android:id="@+id/recently_added_tracks_text_view_clickable"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="@font/open_sans_font_family"
-                    android:paddingStart="8dp"
-                    android:paddingTop="12dp"
-                    android:paddingEnd="8dp"
-                    android:text="See all"
-                    android:textColor="@color/subtitleTextColor"
-                    android:textSize="14sp" />
-
-            </LinearLayout>
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recently_added_tracks_recycler_view"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                android:clipToPadding="false"
-                android:paddingStart="16dp"
-                android:paddingTop="8dp"
-                android:paddingEnd="8dp"
-                android:paddingBottom="8dp" />
-        </LinearLayout>
-
-        <!-- Fashback -->
-        <LinearLayout
-            android:id="@+id/home_flashback_sector"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <!--  Label and button  -->
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:fontFamily="@font/open_sans_font_family"
-                android:paddingStart="16dp"
-                android:paddingTop="20dp"
-                android:paddingEnd="16dp"
-                android:text="Flashback"
-                android:textColor="@color/titleTextColor"
-                android:textSize="22sp"
-                android:textStyle="bold" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/years_recycler_view"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                android:clipToPadding="false"
-                android:paddingStart="16dp"
-                android:paddingTop="8dp"
-                android:paddingEnd="8dp"
-                android:paddingBottom="8dp" />
-        </LinearLayout>
-
-        <!-- Favorites -->
-        <LinearLayout
-            android:id="@+id/home_favorite_tracks_sector"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <!--  Label and button  -->
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingStart="8dp"
-                android:paddingTop="8dp"
-                android:paddingEnd="8dp">
-
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:fontFamily="@font/open_sans_font_family"
-                    android:paddingStart="8dp"
-                    android:paddingTop="12dp"
-                    android:paddingEnd="8dp"
-                    android:text="Favorites"
-                    android:textColor="@color/titleTextColor"
-                    android:textSize="22sp"
-                    android:textStyle="bold" />
-
-
-                <TextView
-                    android:id="@+id/favorites_tracks_text_view_clickable"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="@font/open_sans_font_family"
-                    android:paddingStart="8dp"
-                    android:paddingTop="12dp"
-                    android:paddingEnd="8dp"
-                    android:text="See all"
-                    android:textColor="@color/subtitleTextColor"
-                    android:textSize="14sp" />
-
-            </LinearLayout>
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/favorites_tracks_recycler_view"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                android:clipToPadding="false"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp" />
-        </LinearLayout>
-
         <!--  Most played tracks -->
         <LinearLayout
             android:id="@+id/home_most_played_tracks_sector"
@@ -298,6 +155,151 @@
                 android:paddingEnd="8dp"
                 android:paddingBottom="8dp" />
         </LinearLayout>
+
+        <!-- Fashback -->
+        <LinearLayout
+            android:id="@+id/home_flashback_sector"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <!--  Label and button  -->
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/open_sans_font_family"
+                android:paddingStart="16dp"
+                android:paddingTop="20dp"
+                android:paddingEnd="16dp"
+                android:text="Flashback"
+                android:textColor="@color/titleTextColor"
+                android:textSize="22sp"
+                android:textStyle="bold" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/years_recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:clipToPadding="false"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="8dp"
+                android:paddingBottom="8dp" />
+        </LinearLayout>
+
+        <!-- Favorites -->
+        <LinearLayout
+            android:id="@+id/home_favorite_tracks_sector"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <!--  Label and button  -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingStart="8dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="8dp">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:fontFamily="@font/open_sans_font_family"
+                    android:paddingStart="8dp"
+                    android:paddingTop="12dp"
+                    android:paddingEnd="8dp"
+                    android:text="Favorites"
+                    android:textColor="@color/titleTextColor"
+                    android:textSize="22sp"
+                    android:textStyle="bold" />
+
+
+                <TextView
+                    android:id="@+id/favorites_tracks_text_view_clickable"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/open_sans_font_family"
+                    android:paddingStart="8dp"
+                    android:paddingTop="12dp"
+                    android:paddingEnd="8dp"
+                    android:text="See all"
+                    android:textColor="@color/subtitleTextColor"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/favorites_tracks_recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:clipToPadding="false"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp" />
+        </LinearLayout>
+
+        <!--  Recently added tracks -->
+        <LinearLayout
+            android:id="@+id/home_recently_added_tracks_sector"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <!--  Label and button  -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingStart="8dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="8dp">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:fontFamily="@font/open_sans_font_family"
+                    android:paddingStart="8dp"
+                    android:paddingTop="12dp"
+                    android:paddingEnd="8dp"
+                    android:text="Recently added"
+                    android:textColor="@color/titleTextColor"
+                    android:textSize="22sp"
+                    android:textStyle="bold" />
+
+
+                <TextView
+                    android:id="@+id/recently_added_tracks_text_view_clickable"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/open_sans_font_family"
+                    android:paddingStart="8dp"
+                    android:paddingTop="12dp"
+                    android:paddingEnd="8dp"
+                    android:text="See all"
+                    android:textColor="@color/subtitleTextColor"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recently_added_tracks_recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:clipToPadding="false"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="8dp"
+                android:paddingBottom="8dp" />
+        </LinearLayout>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>