diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt
index 390a2d0a..b9c3c8a2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt
@@ -12,6 +12,7 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.album.AlbumFullWidthAdapter
 import code.name.monkey.retromusic.adapter.artist.ArtistAdapter
 import code.name.monkey.retromusic.adapter.song.SongAdapter
+import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.loaders.PlaylistSongsLoader
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.model.Artist
@@ -97,25 +98,32 @@ class HomeAdapter(
 
     private inner class AlbumViewHolder(view: View) : AbsHomeViewItem(view) {
         fun bindView(list: ArrayList<Album>, titleRes: Int, subtitleRes: Int) {
-            recyclerView.apply {
-                adapter = AlbumFullWidthAdapter(activity, list, displayMetrics)
+            if (list.isNotEmpty()) {
+                recyclerView.apply {
+                    show()
+                    adapter = AlbumFullWidthAdapter(activity, list, displayMetrics)
+                }
+                titleContainer . show ()
+                title.text = activity.getString(titleRes)
+                text.text = activity.getString(subtitleRes)
             }
-            title.text = activity.getString(titleRes)
-            text.text = activity.getString(subtitleRes)
         }
     }
 
     inner class ArtistViewHolder(view: View) : AbsHomeViewItem(view) {
         fun bindView(list: ArrayList<Artist>, titleRes: Int, subtitleRes: Int) {
-            recyclerView.apply {
-                layoutManager = GridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false)
-                val artistAdapter = ArtistAdapter(activity, list,
-                        PreferenceUtil.getInstance(activity).getHomeGridStyle(activity), false, null)
-                adapter = artistAdapter
+            if (list.isNotEmpty()) {
+                recyclerView.apply {
+                    show()
+                    layoutManager = GridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false)
+                    val artistAdapter = ArtistAdapter(activity, list,
+                            PreferenceUtil.getInstance(activity).getHomeGridStyle(activity), false, null)
+                    adapter = artistAdapter
+                }
+                titleContainer.show()
+                title.text = activity.getString(titleRes)
+                text.text = activity.getString(subtitleRes)
             }
-
-            title.text = activity.getString(titleRes)
-            text.text = activity.getString(subtitleRes)
         }
     }
 
@@ -123,20 +131,25 @@ class HomeAdapter(
         fun bindView(arrayList: ArrayList<Playlist>, titleRes: Int, subtitleRes: Int) {
             if (arrayList.isNotEmpty()) {
                 val songs = PlaylistSongsLoader.getPlaylistSongList(activity, arrayList[0])
-                recyclerView.apply {
-                    val songAdapter = SongAdapter(activity, songs, R.layout.item_album_card, false, null)
-                    layoutManager = GridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false)
-                    adapter = songAdapter
+                if (songs.isNotEmpty()) {
+                    recyclerView.apply {
+                        show()
+                        val songAdapter = SongAdapter(activity, songs, R.layout.item_album_card, false, null)
+                        layoutManager = GridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false)
+                        adapter = songAdapter
 
+                    }
+                    titleContainer.show()
+                    title.text = activity.getString(titleRes)
+                    text.text = activity.getString(subtitleRes)
                 }
-                title.text = activity.getString(titleRes)
-                text.text = activity.getString(subtitleRes)
             }
         }
     }
 
     open inner class AbsHomeViewItem(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val recyclerView: RecyclerView = itemView.findViewById(R.id.recyclerView)
+        val titleContainer: View = itemView.findViewById(R.id.titleContainer)
         val title: MaterialTextView = itemView.findViewById(R.id.title)
         val text: MaterialTextView = itemView.findViewById(R.id.text)
     }
diff --git a/app/src/main/res/layout/metal_section_recycler_view.xml b/app/src/main/res/layout/metal_section_recycler_view.xml
index 0f850312..11db0507 100644
--- a/app/src/main/res/layout/metal_section_recycler_view.xml
+++ b/app/src/main/res/layout/metal_section_recycler_view.xml
@@ -16,9 +16,11 @@
         android:focusable="true"
         android:gravity="center_vertical"
         android:orientation="horizontal"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -61,8 +63,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:nestedScrollingEnabled="false"
+        android:visibility="gone"
         app:itemMargin="28dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/titleContainer" />
+        app:layout_constraintTop_toBottomOf="@+id/titleContainer"
+        tools:visibility="visible" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/section_recycler_view.xml b/app/src/main/res/layout/section_recycler_view.xml
index f68e7dda..092108c5 100644
--- a/app/src/main/res/layout/section_recycler_view.xml
+++ b/app/src/main/res/layout/section_recycler_view.xml
@@ -16,9 +16,11 @@
         android:focusable="true"
         android:gravity="center_vertical"
         android:orientation="horizontal"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -61,8 +63,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:nestedScrollingEnabled="false"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/titleContainer" />
+        app:layout_constraintTop_toBottomOf="@+id/titleContainer"
+        tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file