diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0c20f5bf..23f31b96 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -49,6 +49,7 @@
         <entry key="app/src/main/res/layout/fragment_artist_page.xml" value="0.1" />
         <entry key="app/src/main/res/layout/fragment_download.xml" value="0.283363802559415" />
         <entry key="app/src/main/res/layout/fragment_home.xml" value="0.283363802559415" />
+        <entry key="app/src/main/res/layout/fragment_library.xml" value="0.3229166666666667" />
         <entry key="app/src/main/res/layout/fragment_login.xml" value="0.3166496424923391" />
         <entry key="app/src/main/res/layout/fragment_player_bottom_sheet.xml" value="0.3166496424923391" />
         <entry key="app/src/main/res/layout/fragment_playlist_catalogue.xml" value="0.3229166666666667" />
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java
index e1d5d525..1ecfa692 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java
@@ -10,6 +10,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintSet;
 import androidx.fragment.app.FragmentManager;
 import androidx.navigation.Navigation;
 import androidx.recyclerview.widget.RecyclerView;
@@ -50,7 +52,13 @@ public class ArtistHorizontalAdapter extends RecyclerView.Adapter<ArtistHorizont
         Artist artist = artists.get(position);
 
         holder.artistName.setText(MusicUtil.getReadableString(artist.getName()));
-        holder.artistInfo.setText("Album count: " + String.valueOf(artist.getAlbumCount()));
+
+        if(artist.getAlbumCount() > 0) {
+            holder.artistInfo.setText("Album count: " + String.valueOf(artist.getAlbumCount()));
+        }
+        else {
+            holder.artistInfo.setVisibility(View.GONE);
+        }
 
         CustomGlideRequest.Builder
                 .from(context, artist.getId(), CustomGlideRequest.ARTIST_PIC, null)
diff --git a/app/src/main/res/layout/item_horizontal_artist.xml b/app/src/main/res/layout/item_horizontal_artist.xml
index 5c8c63d9..f68bdf1e 100644
--- a/app/src/main/res/layout/item_horizontal_artist.xml
+++ b/app/src/main/res/layout/item_horizontal_artist.xml
@@ -36,10 +36,14 @@
         android:text="@string/label_placeholder"
         app:layout_constraintEnd_toStartOf="@+id/artist_more_button"
         app:layout_constraintStart_toEndOf="@+id/artist_cover_image_view"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/artist_info_text_view"
+        app:layout_constraintVertical_chainStyle="spread"
+        app:layout_constraintVertical_weight="1"/>
 
 
     <TextView
+        android:visibility="gone"
         android:id="@+id/artist_info_text_view"
         style="@style/ItemSubtitleTextView"
         android:layout_width="0dp"
@@ -54,7 +58,8 @@
         android:text="@string/label_placeholder"
         app:layout_constraintEnd_toStartOf="@+id/artist_more_button"
         app:layout_constraintStart_toEndOf="@+id/artist_cover_image_view"
-        app:layout_constraintTop_toBottomOf="@+id/artist_name_text_view" />
+        app:layout_constraintTop_toBottomOf="@+id/artist_name_text_view"
+        app:layout_constraintBottom_toBottomOf="parent"/>
 
     <ImageView
         android:id="@+id/artist_more_button"