diff --git a/approot/artist.xml b/approot/artist.xml
index e8e868dc..8534eb07 100644
--- a/approot/artist.xml
+++ b/approot/artist.xml
@@ -3,42 +3,45 @@
 <!--FORMS message blocks-->
 
 <message id="Lms.Explore.Artist.template">
+	<div class="Lms-header">
+		<h2><div class="Lms-artistname text-primary">${name}</div></h2>
+		${clusters}
+		${play-btn}${add-btn}
+	</div>
+	<div class="row">
+		${releases class="Lms-explore-artist-entries-container"}
+	</div>
 	<div class="row">
-		<div class="col-md-8">
-			<div class="Lms-header">
-				<h2><div class="Lms-artistname text-primary">${name}</div></h2>
-				${clusters}
-				${play-btn}${add-btn}
-			</div>
-			${releases class="Lms-explore-artist-entries-container"}
-		</div>
 		<div class="col-md-4">
 			<div class="well well-sm">
 				<h3>${tr:Lms.Explore.Artist.similar-artists}</h3>
 				${similar-artists}
 			</div>
 		</div>
+		${<if-has-mbid>}
+		<div class="col-md-4">
+			<div class="well well-sm">
+				<h3>${tr:Lms.Explore.links}</h3>
+				${mbid-link class="text-muted"}
+			</div>
+		</div>
+		${</if-has-mbid>}
 	</div>
 </message>
 
 <message id="Lms.Explore.Artist.template.entry">
-	<div class="row Lms-explore-artist-entry Lms-entry-hoverable">
-		<div class="col-xs-12">
-			<div class="media">
-				<div class="media-left media-middle">
-					<div class="media-object Lms-cover-container-medium">
-						${cover}
-					</div>
-				</div>
-				<div class="media-body media-middle">
-					<h4 class="media-heading">
-						${name class="Lms-releasename text-primary"}
-					</h4>
-					${<if-has-artist>}<h4><small>${artist class="Lms-artistname text-muted"}</small></h4>${</if-has-artist>}
-					<h4><small><div class="text-muted">${<if-has-year>}${year}${</if-has-year>}${<if-has-orig-year>} (${orig-year})${</if-has-orig-year>}</div></small></h4>
-					${play-btn}${add-btn}
+	<div class="Lms-explore-entry-list">
+		<div class="row Lms-vertical-align">
+			<div class="col-xs-4 col-sm-3 col-md-2">
+				<div class="Lms-responsive-square Lms-cover-container">
+					${cover}
 				</div>
 			</div>
+			<div class="col-xs-8 col-sm-9 col-md-10 Lms-explore-list-entry-text-container">
+					<h5>${name class="Lms-releasename text-primary"}</h5>
+					${<if-has-artist>}<h6>${artist class="Lms-artistname text-muted"}</h6>${</if-has-artist>}
+					<h6><small><div class="text-muted">${<if-has-year>}${year}${</if-has-year>}${<if-has-orig-year>} (${orig-year})${</if-has-orig-year>}</div></small></h6>
+			</div>
 		</div>
 	</div>
 </message>
diff --git a/approot/artists.xml b/approot/artists.xml
index 333e0ca8..b5ed55b3 100644
--- a/approot/artists.xml
+++ b/approot/artists.xml
@@ -13,26 +13,20 @@
 		</div>
 	</div>
 	${artists}
-	<div class="row">
-		<div class="col-xs-12 Lms-horizontal-center">
-			${show-more class="btn-primary Lms-show-more"}
-		</div>
+	<div class="Lms-horizontal-center">
+		${show-more class="btn-primary Lms-show-more"}
 	</div>
 </message>
 
 <message id="Lms.Explore.Artists.template.entry">
-	<div class="row Lms-explore-artists-entry Lms-entry-hoverable Lms-vertical-align">
-		 <div class="col-xs-12">
-			 <h4>${name class="Lms-artistname text-primary"}</h4>
-		</div>
+	<div class="Lms-explore-artists-entry Lms-entry-hoverable Lms-vertical-align">
+		 <h4>${name class="Lms-artistname text-primary"}</h4>
 	</div>
 </message>
 
 <message id="Lms.Explore.Artists.template.entry-small">
-	<div class="row Lms-explore-artists-entry-small Lms-entry-hoverable Lms-vertical-align">
-		<div class="col-xs-12">
-			${name class="Lms-artistname text-primary"}
-		</div>
+	<div class="Lms-explore-artists-entry-small Lms-entry-hoverable Lms-vertical-align">
+		${name class="Lms-artistname text-primary"}
 	</div>
 </message>
 
diff --git a/approot/mediaplayer.xml b/approot/mediaplayer.xml
index 94bcfef9..43f0ff45 100644
--- a/approot/mediaplayer.xml
+++ b/approot/mediaplayer.xml
@@ -35,7 +35,7 @@
 				</div>
 			</div>
 			<div class="hidden-xs col-sm-2 Lms-player-duration text-muted">
-				<a id="lms-transcoding-active" class="Lms-player-btn Lms-control-btn" data-toggle="tooltip" title="${tr:Lms.Player.transcoding-active}" style="display:none"><i class="fa fa-fw fa-info-circle" aria-hidden="true"></i></a>
+				<a id="lms-transcoding-active" class="Lms-player-btn Lms-control-btn" data-toggle="tooltip" title="${tr:Lms.Player.transcoding-active}" style="visibility:hidden"><i class="fa fa-fw fa-info-circle" aria-hidden="true"></i></a>
 				<span id="lms-mp-curtime">--</span> / <span id="lms-mp-duration">--</span>
 			</div>
 		</div>
diff --git a/approot/messages.xml b/approot/messages.xml
index e1f7327a..9c63aee0 100644
--- a/approot/messages.xml
+++ b/approot/messages.xml
@@ -20,7 +20,6 @@
 <message id="Lms.password-old">Old password</message>
 <message id="Lms.password-too-weak">Password too weak</message>
 <message id="Lms.passwords-dont-match">Passwords don't match</message>
-<message id="Lms.quit-confirm">Are you sure?</message>
 <message id="Lms.quit-other-session">Another session has been open. Reopen this one?</message>
 <message id="Lms.save">Save</message>
 <message id="Lms.user">User</message>
@@ -106,7 +105,10 @@
 <message id="Lms.Explore.artists">Artists</message>
 <message id="Lms.Explore.filter-added">Filter added</message>
 <message id="Lms.Explore.filters">Filters</message>
+<message id="Lms.Explore.links">Links</message>
 <message id="Lms.Explore.most-played">Most played</message>
+<message id="Lms.Explore.musicbrainz-artist">MusicBrainz Artist</message>
+<message id="Lms.Explore.musicbrainz-release">MusicBrainz Release</message>
 <message id="Lms.Explore.random">Random</message>
 <message id="Lms.Explore.recently-added">Recently added</message>
 <message id="Lms.Explore.recently-played">Recently played</message>
@@ -194,4 +196,3 @@
 <message id="Lms.Settings.settings-saved">New settings saved!</message>
 
 </messages>
-
diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml
index 65428acd..7b92c05b 100644
--- a/approot/messages_fr.xml
+++ b/approot/messages_fr.xml
@@ -20,7 +20,6 @@
 <message id="Lms.password-old">Ancien mot de passe</message>
 <message id="Lms.password-too-weak">Mot de passe trop faible</message>
 <message id="Lms.passwords-dont-match">Les mots de passe ne correspondent pas</message>
-<message id="Lms.quit-confirm">Êtes-vous sûr ?</message>
 <message id="Lms.quit-other-session">Une autre session a été ouverte. Reouvrir celle-ci ?</message>
 <message id="Lms.save">Sauvegarder</message>
 <message id="Lms.user">Utilisateur</message>
@@ -106,7 +105,10 @@
 <message id="Lms.Explore.artists">Artistes</message>
 <message id="Lms.Explore.filter-added">Filtre ajouté</message>
 <message id="Lms.Explore.filters">Filtres</message>
-<message id="Lms.Explore.mostly-played">Plus joués</message>
+<message id="Lms.Explore.links">Liens</message>
+<message id="Lms.Explore.most-played">Plus joués</message>
+<message id="Lms.Explore.musicbrainz-artist">MusicBrainz Artist</message>
+<message id="Lms.Explore.musicbrainz-release">MusicBrainz Release</message>
 <message id="Lms.Explore.random">Aléatoire</message>
 <message id="Lms.Explore.recently-added">Ajoutés récemment</message>
 <message id="Lms.Explore.recently-played">Joués récemment</message>
@@ -191,7 +193,6 @@
 <message id="Lms.Settings.transcode-mode.always">Toujours</message>
 <message id="Lms.Settings.transcode-mode.if-format-not-supported">Seulement lorsque le format n'est pas pris en charge</message>
 <message id="Lms.Settings.transcode-mode.never">Jamais</message>
-<message id="Lms.Settings.settings">Paramètres</message>
 <message id="Lms.Settings.settings-saved">Paramètres sauvegardés !</message>
 
 <!--Wt-->
diff --git a/approot/playqueue.xml b/approot/playqueue.xml
index ee9a9a10..e4e8ebcd 100644
--- a/approot/playqueue.xml
+++ b/approot/playqueue.xml
@@ -9,17 +9,15 @@
 
 <message id="Lms.PlayQueue.template">
 	<div class="row">
-		<div class="col-md-8">
+		<div class="col-lg-8">
 			<div class="Lms-header">
 				<h2>${tr:Lms.PlayQueue.playqueue}</h2>
 				${clear-btn}${shuffle-btn}${repeat-btn}${radio-btn}
 				<h4><small>${nb-tracks}</small></h4>
 			</div>
 			${entries}
-			<div class="row">
-				<div class="col-xs-12 Lms-horizontal-center">
-					${show-more class="btn-primary Lms-show-more"}
-				</div>
+			<div class="Lms-horizontal-center">
+				${show-more class="btn-primary Lms-show-more"}
 			</div>
 		</div>
 	</div>
@@ -29,24 +27,20 @@
 <message id="Lms.PlayQueue.template.delete-btn"><i class="fa fa-fw fa-times-circle Lms-playqueue-btn Lms-control-btn"></i></message>
 
 <message id="Lms.PlayQueue.template.entry">
-	<div class="row Lms-playqueue-entry Lms-entry-hoverable Lms-vertical-align ${is-selected}">
-		<div class="col-xs-9 Lms-playqueue-entry-name">
-			<div class="media">
-				<div class="media-left media-middle hidden-xs">
-					<div class="media-object Lms-cover-container-small">
-						${cover}
-					</div>
-				</div>
-				<div class="media-body media-middle">
-					<h4><div class="Lms-trackname text-primary">${name}</div></h4>
-					${<if-has-artists-or-release>}
-					${<if-has-release>}<small>${release class="Lms-releasename text-primary"}</small>${</if-has-release>}
-					${<if-has-artists>}${artists}${</if-has-artists>}
-					${</if-has-artists-or-release>}
-				</div>
+	<div class="row Lms-vertical-align Lms-explore-entry-list Lms-playqueue-entry ${is-selected}">
+		<div class="col-xs-3 col-sm-2 col-md-2">
+			<div class="Lms-responsive-square Lms-cover-container">
+				${cover}
 			</div>
 		</div>
-		<div class="col-xs-3">
+		<div class="col-xs-7 col-sm-8 col-md-8 Lms-explore-entry-list-text-container">
+			<div class="Lms-trackname text-primary"><h5>${name}</h5></div>
+			${<if-has-artists-or-release>}
+			${<if-has-release>}<small>${release class="Lms-releasename text-primary"}</small>${</if-has-release>}
+			${<if-has-artists>}${artists}${</if-has-artists>}
+			${</if-has-artists-or-release>}
+		</div>
+		<div class="col-xs-2 col-sm-2 col-md-2">
 			<div class="Lms-playqueue-entry-controls Lms-vertical-align">
 				${play-btn}${del-btn}
 			</div>
diff --git a/approot/release.xml b/approot/release.xml
index b2b48c92..86e6d9c2 100644
--- a/approot/release.xml
+++ b/approot/release.xml
@@ -7,11 +7,11 @@
 </message>
 
 <message id="Lms.Explore.Release.template">
-	<div class="row">
-		<div class="col-md-3">
+	<div class="row Lms-explore-release">
+		<div class="col-md-4">
 			${cover class="Lms-explore-release-cover"}
 		</div>
-		<div class="col-md-5">
+		<div class="col-md-8">
 			<div class="Lms-header">
 				<h3><div class="Lms-releasename text-primary">${name}</div></h3>
 				${<if-has-artist>}<h4>${artist class="Lms-artistname text-muted"}</h4>${</if-has-artist>}
@@ -19,19 +19,34 @@
 				${clusters}
 				${play-btn}${add-btn}
 			</div>
-			${container class="Lms-explore-release-entries-container"}
+			${container}
 		</div>
-		<div class="col-md-4">
+	</div>
+	<div class="row">
+		<div class="col-xs-12 col-md-8">
 			<div class="well well-sm">
-				${<if-has-copyright-or-copyright-url>}
-				<h3>${tr:Lms.Explore.Release.copyright}</h3>
-				${<if-has-copyright>}<small>${copyright}</small>${</if-has-copyright>}
-				${<if-has-copyright-url>}<small>${copyright-url}</small>${</if-has-copyright-url>}
-				${</if-has-copyright-or-copyright-url>}
 				<h3>${tr:Lms.Explore.Release.similar-releases}</h3>
-				${similar-releases}
+				<div class="row">
+					${similar-releases}
+				</div>
 			</div>
 		</div>
+		${<if-has-copyright>}
+		<div class="col-xs-12 col-md-4">
+			<div class="well well-sm">
+				<h3>${tr:Lms.Explore.Release.copyright}</h3>
+				${copyright class="text-muted"}
+			</div>
+		</div>
+		${</if-has-copyright>}
+		${<if-has-mbid>}
+		<div class="col-xs-12 col-md-4">
+			<div class="well well-sm">
+				<h3>${tr:Lms.Explore.links}</h3>
+				${mbid-link class="text-muted"}
+			</div>
+		</div>
+		${</if-has-mbid>}
 	</div>
 </message>
 
diff --git a/approot/releases.xml b/approot/releases.xml
index 2be216d9..3ccc42f5 100644
--- a/approot/releases.xml
+++ b/approot/releases.xml
@@ -8,54 +8,26 @@
 		${mode class="nav nav-pills Lms-explore-mode-container"}
 		${play-btn}${add-btn}
 	</div>
-	${releases}
 	<div class="row">
-		<div class="col-xs-12 Lms-horizontal-center">
-			${show-more class="btn-primary Lms-show-more"}
-		</div>
+		${releases}
+	</div>
+	<div class="Lms-horizontal-center">
+		${show-more class="btn-primary Lms-show-more"}
 	</div>
 </message>
 
-<message id="Lms.Explore.Releases.template.entry">
-	<div class="row Lms-explore-releases-entry Lms-entry-hoverable">
-		<div class="col-xs-12">
-			<div class="media">
-				<div class="media-left media-middle">
-					<div class="media-object Lms-cover-container-medium">
-						${cover}
-					</div>
-				</div>
-				<div class="media-body media-middle">
-					<h4 class="media-heading">
-						${release-name class="Lms-releasename text-primary"}
-					</h4>
-					${<if-has-artist>}<h4><small>${artist-name class="Lms-artistname text-muted"}</small></h4>${</if-has-artist>}
-					${play-btn}${add-btn}
-				</div>
+<message id="Lms.Explore.Releases.template.entry-grid">
+	<div class="col-xs-6 col-sm-3 col-md-2 col-lg-2">
+		<div class="Lms-explore-entry-grid">
+			<div class="Lms-responsive-square Lms-cover-container">
+				${cover}
+			</div>
+			<div class="Lms-explore-entry-grid-text-container">
+				<h5>${release-name class="Lms-releasename text-primary"}</h5>
+				<div class="Lms-explore-entry-separator"><h6>${<if-has-year>}<small><span class="text-muted">${year}</span></small>${</if-has-year>}${<if-has-artist>}${artist-name class="Lms-artistname text-muted"}${</if-has-artist>}</h6></div>
 			</div>
 		</div>
 	</div>
 </message>
 
-<message id="Lms.Explore.Releases.template.entry-small">
-	<div class="row Lms-explore-releaselink Lms-entry-hoverable">
-		<div class="col-xs-12">
-			<div class="media">
-				<div class="media-left media-middle">
-					<div class="media-object Lms-cover-container-smaller">
-						${cover}
-					</div>
-				</div>
-				<div class="media-body media-middle">
-					<div class="media-heading">
-						${release-name class="Lms-releasename text-primary"}
-					</div>
-					${<if-has-artist>}<small>${artist-name class="Lms-artistname text-muted"}</small>${</if-has-artist>}
-				</div>
-			</div>
-		</div>
-	</div>
-</message>
-
-
 </messages>
diff --git a/approot/search.xml b/approot/search.xml
index 8c3fff06..a6f8c536 100644
--- a/approot/search.xml
+++ b/approot/search.xml
@@ -6,38 +6,33 @@
 	<div class="Lms-header">
 		<h2>${tr:Lms.Explore.Search.search}</h2>
 	</div>
-	${<if-artists>}
-		<h3>${tr:Lms.Explore.artists}</h3>
-		${artists}
-	${</if-artists>}
-	${<if-releases>}
-		<h3>${tr:Lms.Explore.releases}</h3>
-		${releases}
-	${</if-releases>}
-	${<if-tracks>}
-		<h3>${tr:Lms.Explore.tracks}</h3>
-		${tracks}
-	${</if-tracks>}
-</message>
-
-<message id="Lms.Explore.Search.template.track-entry">
-	<div class="row Lms-explore-tracks-entry Lms-entry-hoverable Lms-vertical-align">
-		<div class="col-xs-12 Lms-explore-tracks-entry-name">
-			<div class="media">
-				<div class="media-left media-middle hidden-xs">
-					<div class="media-object Lms-cover-container-small">
-						${cover}
-					</div>
-				</div>
-				<div class="media-body media-middle">
-					<h4><div class="Lms-trackname text-primary">${name}</div></h4>
-					${<if-has-artists-or-release>}
-					${<if-has-release>}<small>${release class="Lms-releasename text-primary"}</small>${</if-has-release>}
-					${<if-has-artists>}${artists}${</if-has-artists>}
-					${</if-has-artists-or-release>}
+	<div class="row">
+		${<if-artists>}
+		<div class="col-lg-8">
+			<div class="well well-sm">
+				<h3>${tr:Lms.Explore.artists}</h3>
+				${artists}
+			</div>
+		</div>
+		${</if-artists>}
+		${<if-releases>}
+		<div class="col-lg-8">
+			<div class="well well-sm">
+				<h3>${tr:Lms.Explore.releases}</h3>
+				<div class="row">
+					${releases}
 				</div>
 			</div>
 		</div>
+		${</if-releases>}
+		${<if-tracks>}
+		<div class="col-lg-8">
+			<div class="well well-sm">
+				<h3>${tr:Lms.Explore.tracks}</h3>
+				${tracks}
+			</div>
+		</div>
+		${</if-tracks>}
 	</div>
 </message>
 
diff --git a/approot/tracks.xml b/approot/tracks.xml
index fb0c26ac..fe402479 100644
--- a/approot/tracks.xml
+++ b/approot/tracks.xml
@@ -4,50 +4,44 @@
 <!--FORMS message blocks-->
 
 <message id="Lms.Explore.Tracks.template">
-	<div class="Lms-header">
-		<h2>${tr:Lms.Explore.tracks}</h2>
-		${mode class="nav nav-pills Lms-explore-mode-container"}
-		${play-btn}${add-btn}
-	</div>
 	<div class="row">
 		<div class="col-lg-8">
+			<div class="Lms-header">
+				<h2>${tr:Lms.Explore.tracks}</h2>
+				${mode class="nav nav-pills Lms-explore-mode-container"}
+				${play-btn}${add-btn}
+			</div>
 			${tracks}
-		</div>
-	</div>
-	<div class="row">
-		<div class="col-lg-8 col-xs-12 Lms-horizontal-center">
-			${show-more class="btn-primary Lms-show-more"}
+			<div class="Lms-horizontal-center">
+				${show-more class="btn-primary Lms-show-more"}
+			</div>
 		</div>
 	</div>
 </message>
 
 <message id="Lms.Explore.Tracks.template.entry">
-	<div class="row Lms-explore-tracks-entry Lms-entry-hoverable Lms-vertical-align ${is-playing}">
-		<div class="col-xs-9 Lms-explore-tracks-entry-name">
-			<div class="media">
-				<div class="media-left media-middle hidden-xs">
-					<div class="media-object Lms-cover-container-small">
-						${cover}
-					</div>
+		<div class="row Lms-vertical-align Lms-explore-entry-list Lms-explore-tracks-entry ${is-playing}">
+			<div class="col-xs-3 col-sm-2 col-md-2">
+				<div class="Lms-responsive-square Lms-cover-container">
+					${cover}
 				</div>
-				<div class="media-body media-middle">
-					<h4><div class="Lms-trackname text-primary">${name}</div></h4>
-					${<if-has-artists-or-release>}
-					${<if-has-release>}<small>${release class="Lms-releasename text-primary"}</small>${</if-has-release>}
-					${<if-has-artists>}${artists}${</if-has-artists>}
-					${</if-has-artists-or-release>}
+			</div>
+			<div class="col-xs-7 col-sm-8 col-md-8 Lms-explore-entry-list-text-container">
+				<div class="Lms-trackname text-primary"><h5>${name}</h5></div>
+				${<if-has-artists-or-release>}
+				${<if-has-release>}<small>${release class="Lms-releasename text-primary"}</small>${</if-has-release>}
+				${<if-has-artists>}${artists}${</if-has-artists>}
+				${</if-has-artists-or-release>}
+			</div>
+			<div class="col-xs-2 col-sm-2 col-md-2">
+				<div class="Lms-explore-tracks-entry-controls">
+					${play-btn}${add-btn}
+				</div>
+				<div class="Lms-explore-tracks-entry-duration text-muted">
+					${duration}
 				</div>
 			</div>
 		</div>
-		<div class="col-xs-3">
-			<div class="Lms-explore-tracks-entry-controls">
-				${play-btn}${add-btn}
-			</div>
-			<div class="Lms-explore-tracks-entry-duration text-muted">
-				${duration}
-			</div>
-		</div>
-	</div>
 </message>
 
 <message id="Lms.Explore.Tracks.template.entry-artist">
diff --git a/docroot/css/lms.css b/docroot/css/lms.css
index fe8f0a1d..3fecc982 100644
--- a/docroot/css/lms.css
+++ b/docroot/css/lms.css
@@ -75,27 +75,18 @@ a.Lms-artistname:hover, a.Lms-artistname:focus {
 	margin: auto;
 	border-radius: 3px;
 	box-shadow: 0 2px 3px rgba(0, 0, 0, 0.4);
+    opacity: 0;
+    -moz-transition: opacity 1s;
+    -webkit-transition: opacity 1s;
+    -o-transition: opacity 1s;
+    transition: opacity 1s;
 }
 
 .Lms-cover:hover {
 	filter: brightness(130%);
 }
 
-.Lms-cover-container-smaller {
-	width: 64px;
-	height: 64px;
-	position: relative;
-}
-
-.Lms-cover-container-small {
-	width: 96px;
-	height: 96px;
-	position: relative;
-}
-
-.Lms-cover-container-medium {
-	width: 128px;
-	height: 128px;
+.Lms-cover-container {
 	position: relative;
 }
 
@@ -104,6 +95,10 @@ a.Lms-artistname:hover, a.Lms-artistname:focus {
 	box-shadow: 0 2px 3px rgba(0, 0, 0, 0.4);
 }
 
+.Lms-cover-loaded {
+    opacity: 1;
+}
+
 .Lms-entry-playing {
 	font-weight: bold;
 	border-radius: 3px;
@@ -124,17 +119,52 @@ a.Lms-artistname:hover, a.Lms-artistname:focus {
 	margin-bottom: 24px;
 }
 
-.Lms-explore-releases-entry {
+.Lms-explore-entry-list {
 	padding-top: 4px;
 	padding-bottom: 4px;
 }
 
-.Lms-explore-release-cover {
-	max-width: 100%;
+.Lms-explore-entry-list-text-container {
+	margin-left: -15px;
+	text-align: left;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
-.Lms-explore-release-entries-container {
-	margin-bottom: 15px;
+.Lms-explore-entry-list-text-container h5 {
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.Lms-explore-entry-grid {
+	margin-bottom: 25px;
+}
+
+.Lms-explore-entry-grid-text-container {
+	height: 36px;
+}
+
+.Lms-explore-entry-grid-text-container h5, h6 {
+	margin-top: 6px;
+	margin-bottom: 6px;
+	text-align: left;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.Lms-explore-entry-separator :nth-child(2) {
+	margin-left: 8px;
+}
+
+.Lms-explore-release {
+	margin-bottom: 25px;
+}
+
+.Lms-explore-release-cover {
+	max-width: 100%;
 }
 
 .Lms-explore-release-entry-tracknumber {
@@ -207,11 +237,6 @@ a.Lms-artistname:hover, a.Lms-artistname:focus {
 	display: none;
 }
 
-.Lms-explore-tracks-entry-name {
-	margin-top: 4px;
-	margin-bottom: 4px;
-}
-
 .Lms-explore-tracks-entry-controls {
 	text-align: right;
 	display: none;
@@ -443,6 +468,16 @@ a.Lms-releasename:hover, a.Lms-releasename:focus {
 	color: var(--hover-color);
 }
 
+.Lms-responsive-square {
+	width: 100%;
+}
+
+.Lms-responsive-square:after {
+	content: "";
+	display: block;
+	padding-bottom: 100%;
+}
+
 .Lms-show-more {
 	margin-top: 8px;
 	margin-bottom: 8px;
diff --git a/docroot/js/mediaplayer.js b/docroot/js/mediaplayer.js
index b813ea4d..85ddae5c 100644
--- a/docroot/js/mediaplayer.js
+++ b/docroot/js/mediaplayer.js
@@ -203,10 +203,10 @@ LMS.mediaplayer = function () {
 
 		_elems.audio.addEventListener("canplay", function() {
 			if (_getAudioMode() == Mode.Transcode) {
-				_elems.transcodingActive.style.display = "inline-block";
+				_elems.transcodingActive.style.visibility = "visible";
 			}
 			else {
-				_elems.transcodingActive.style.display = "none";
+				_elems.transcodingActive.style.visibility = "hidden";
 			}
 		});
 
diff --git a/src/libs/database/impl/Artist.cpp b/src/libs/database/impl/Artist.cpp
index a440e195..7f2302f7 100644
--- a/src/libs/database/impl/Artist.cpp
+++ b/src/libs/database/impl/Artist.cpp
@@ -362,7 +362,7 @@ Artist::getReleases(const std::set<IdType>& clusterIds) const
 	if (!clusterIds.empty())
 		oss << " GROUP BY t.id HAVING COUNT(DISTINCT c.id) = " << clusterIds.size();
 
-	oss << " ORDER BY t.year,r.name";
+	oss << " ORDER BY t.year DESC, r.name COLLATE NOCASE";
 
 	Wt::Dbo::Query<Release::pointer> query = session()->query<Release::pointer>( oss.str() );
 
@@ -395,7 +395,7 @@ Artist::getTracks(std::optional<TrackArtistLink::Type> linkType) const
 
 	auto query {session()->query<Wt::Dbo::ptr<Track>>("SELECT DISTINCT t FROM track t INNER JOIN artist a ON a.id = t_a_l.artist_id INNER JOIN track_artist_link t_a_l ON t_a_l.track_id = t.id")
 		.where("a.id = ?").bind(self()->id())
-		.orderBy("t.year,t.release_id,t.disc_number,t.track_number")};
+		.orderBy("t.year DESC,t.release_id,t.disc_number,t.track_number")};
 
 	if (linkType)
 		query.where("t_a_l.type = ?").bind(*linkType);
@@ -453,7 +453,12 @@ Artist::getSimilarArtists(std::optional<std::size_t> offset, std::optional<std::
 			" INNER JOIN track t ON t.id = t_a_l.track_id"
 			" INNER JOIN track_cluster t_c ON t_c.track_id = t.id"
 				" WHERE "
-					" t_c.cluster_id IN (SELECT c.id from cluster c INNER JOIN track t ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN artist a ON a.id = t_a_l.artist_id INNER JOIN track_artist_link t_a_l ON t_a_l.track_id = t.id WHERE a.id = ?)"
+					" t_c.cluster_id IN (SELECT c.id from cluster c"
+											" INNER JOIN track t ON c.id = t_c.cluster_id"
+											" INNER JOIN track_cluster t_c ON t_c.track_id = t.id"
+											" INNER JOIN artist a ON a.id = t_a_l.artist_id"
+											" INNER JOIN track_artist_link t_a_l ON t_a_l.track_id = t.id"
+											" WHERE a.id = ?)"
 					" AND a.id <> ?"
 				)
 		.bind(self()->id())
diff --git a/src/lms/CMakeLists.txt b/src/lms/CMakeLists.txt
index 6755b1c1..3cb6a7be 100644
--- a/src/lms/CMakeLists.txt
+++ b/src/lms/CMakeLists.txt
@@ -6,7 +6,7 @@ add_executable(lms
 	ui/LmsApplicationGroup.cpp
 	ui/LmsTheme.cpp
 	ui/MediaPlayer.cpp
-	ui/PlayQueueView.cpp
+	ui/PlayQueue.cpp
 	ui/SettingsView.cpp
 	ui/TrackStringUtils.cpp
 	ui/admin/DatabaseSettingsView.cpp
@@ -24,6 +24,7 @@ add_executable(lms
 	ui/explore/ReleasesView.cpp
 	ui/explore/ReleaseView.cpp
 	ui/explore/SearchView.cpp
+	ui/explore/TrackListHelpers.cpp
 	ui/explore/TracksView.cpp
 	ui/resource/AudioFileResource.cpp
 	ui/resource/AudioTranscodeResource.cpp
diff --git a/src/lms/ui/LmsApplication.cpp b/src/lms/ui/LmsApplication.cpp
index a5fd841e..89cebb24 100644
--- a/src/lms/ui/LmsApplication.cpp
+++ b/src/lms/ui/LmsApplication.cpp
@@ -50,7 +50,7 @@
 #include "LmsApplicationException.hpp"
 #include "LmsTheme.hpp"
 #include "MediaPlayer.hpp"
-#include "PlayQueueView.hpp"
+#include "PlayQueue.hpp"
 #include "SettingsView.hpp"
 
 
@@ -251,6 +251,7 @@ LmsApplication::createArtistAnchor(Database::Artist::pointer artist, bool addTex
 	{
 		res->setTextFormat(Wt::TextFormat::Plain);
 		res->setText(Wt::WString::fromUTF8(artist->getName()));
+		res->setToolTip(Wt::WString::fromUTF8(artist->getName()), Wt::TextFormat::Plain);
 	}
 
 	return res;
@@ -269,8 +270,10 @@ LmsApplication::createReleaseAnchor(Database::Release::pointer release, bool add
 
 	if (addText)
 	{
+		res->setWordWrap(false);
 		res->setTextFormat(Wt::TextFormat::Plain);
 		res->setText(Wt::WString::fromUTF8(release->getName()));
+		res->setToolTip(Wt::WString::fromUTF8(release->getName()), Wt::TextFormat::Plain);
 	}
 
 	return res;
@@ -314,7 +317,6 @@ LmsApplication::handleException(LmsApplicationException& e)
 	Wt::WPushButton* btn {t->bindNew<Wt::WPushButton>("btn-go-home", Wt::WString::tr("Lms.Error.go-home"))};
 	btn->clicked().connect([this]()
 	{
-		setConfirmCloseMessage("");
 		redirect(".");
 	});
 }
@@ -322,7 +324,6 @@ LmsApplication::handleException(LmsApplicationException& e)
 void
 LmsApplication::goHomeAndQuit()
 {
-	setConfirmCloseMessage("");
 	WApplication::quit("");
 	redirect(".");
 }
@@ -394,7 +395,6 @@ LmsApplication::handleUserLoggedOut()
 		getUser().modify()->clearAuthTokens();
 	}
 
-	setConfirmCloseMessage("");
 	goHomeAndQuit();
 }
 
@@ -426,7 +426,8 @@ LmsApplication::createHome()
 	_audioTranscodeResource = std::make_shared<AudioTranscodeResource>();
 	_audioFileResource = std::make_shared<AudioFileResource>();
 
-	setConfirmCloseMessage(Wt::WString::tr("Lms.quit-confirm"));
+	declareJavaScriptFunction("onLoadCover", "function(id) { id.className += \" Lms-cover-loaded\"}");
+	doJavaScript("$('body').tooltip({ selector: '[data-toggle=\"tooltip\"]'})");
 
 	Wt::WTemplate* main {root()->addWidget(std::make_unique<Wt::WTemplate>(Wt::WString::tr("Lms.template")))};
 
@@ -467,7 +468,7 @@ LmsApplication::createHome()
 	mainStack->setAttributeValue("style", "overflow-x:visible;overflow-y:visible;");
 
 	Explore* explore = mainStack->addNew<Explore>(filters);
-	PlayQueue* playqueue = mainStack->addNew<PlayQueue>();
+	_playQueue = mainStack->addNew<PlayQueue>();
 	auto* search {mainStack->addNew<SearchView>(filters)};
 	mainStack->addNew<SettingsView>();
 
@@ -490,37 +491,31 @@ LmsApplication::createHome()
 		mainStack->addNew<UserView>();
 	}
 
-	explore->tracksAdd.connect([=] (const std::vector<Database::IdType>& trackIds)
+	explore->tracksAction.connect([this] (PlayQueueAction action, const std::vector<Database::IdType>& trackIds)
 	{
-		playqueue->addTracks(trackIds);
+		_playQueue->processTracks(action, trackIds);
 	});
 
-	explore->tracksPlay.connect([=] (const std::vector<Database::IdType>& trackIds)
-	{
-		playqueue->playTracks(trackIds);
-	});
-
-
 	// Events from MediaPlayer
-	_mediaPlayer->playNext.connect([=]
+	_mediaPlayer->playNext.connect([this]
 	{
-		playqueue->playNext();
+		_playQueue->playNext();
 	});
-	_mediaPlayer->playPrevious.connect([=]
+	_mediaPlayer->playPrevious.connect([this]
 	{
-		playqueue->playPrevious();
+		_playQueue->playPrevious();
 	});
-	_mediaPlayer->playbackEnded.connect([=]
+	_mediaPlayer->playbackEnded.connect([this]
 	{
-		playqueue->playNext();
+		_playQueue->playNext();
 	});
 
-	playqueue->trackSelected.connect([=] (Database::IdType trackId, bool play, float replayGain)
+	_playQueue->trackSelected.connect([this] (Database::IdType trackId, bool play, float replayGain)
 	{
 		_mediaPlayer->loadTrack(trackId, play, replayGain);
 	});
 
-	playqueue->trackUnselected.connect([=] ()
+	_playQueue->trackUnselected.connect([this] ()
 	{
 		_mediaPlayer->stop();
 	});
@@ -579,7 +574,6 @@ LmsApplication::createHome()
 		// Only one active session by user
 		if (!LmsApp->isUserDemo())
 		{
-			setConfirmCloseMessage("");
 			quit(Wt::WString::tr("Lms.quit-other-session"));
 		}
 	});
diff --git a/src/lms/ui/LmsApplication.hpp b/src/lms/ui/LmsApplication.hpp
index e66d7ec0..20cac9b7 100644
--- a/src/lms/ui/LmsApplication.hpp
+++ b/src/lms/ui/LmsApplication.hpp
@@ -45,6 +45,7 @@ class Auth;
 class ImageResource;
 class LmsApplicationException;
 class MediaPlayer;
+class PlayQueue;
 
 // Events that can be listen from anywhere in the application
 struct Events
@@ -100,7 +101,8 @@ class LmsApplication : public Wt::WApplication
 		static std::unique_ptr<Wt::WAnchor> createReleaseAnchor(Wt::Dbo::ptr<Database::Release> release, bool addText = true);
 		static std::unique_ptr<Wt::WText> createCluster(Wt::Dbo::ptr<Database::Cluster> cluster, bool canDelete = false);
 
-		MediaPlayer* getMediaPlayer() const { return _mediaPlayer; }
+		MediaPlayer&	getMediaPlayer() const { return *_mediaPlayer; }
+		PlayQueue&		getPlayQueue() const { return *_playQueue; }
 
 		// Signal emitted just before the session ends (user may already be logged out)
 		Wt::Signal<>&	preQuit() { return _preQuit; }
@@ -124,13 +126,14 @@ class LmsApplication : public Wt::WApplication
 		Wt::Signal<>				_preQuit;
 		Database::Session			_dbSession;
 		LmsApplicationGroupContainer&   	_appGroups;
-		Events					_events;
+		Events						_events;
 		std::optional<Database::IdType>	_userId;
 		std::optional<bool>			_userAuthStrong;
 		std::shared_ptr<AudioTranscodeResource>	_audioTranscodeResource;
 		std::shared_ptr<AudioFileResource>	_audioFileResource;
 		std::shared_ptr<ImageResource>		_imageResource;
 		MediaPlayer*				_mediaPlayer {};
+		PlayQueue*					_playQueue {};
 };
 
 
diff --git a/src/lms/ui/MediaPlayer.cpp b/src/lms/ui/MediaPlayer.cpp
index f5390ddb..e0c10cc2 100644
--- a/src/lms/ui/MediaPlayer.cpp
+++ b/src/lms/ui/MediaPlayer.cpp
@@ -255,9 +255,8 @@ MediaPlayer::loadTrack(Database::IdType trackId, bool play, float replayGain)
 			<< " artist: \"" << (!artists.empty() ? StringUtils::jsEscape(artists.front()->getName()) : "") << "\","
 			<< " release: \"" << (track->getRelease() ? StringUtils::jsEscape(track->getRelease()->getName()) : "") << "\","
 			<< " artwork: ["
-			<< "   { src: \"" << LmsApp->getImageResource()->getTrackUrl(trackId, 96) << "\",  sizes: \"96x96\",	type: \"" << imgResourceMimeType << "\" },"
-			<< "   { src: \"" << LmsApp->getImageResource()->getTrackUrl(trackId, 256) << "\", sizes: \"256x256\",	type: \"" << imgResourceMimeType << "\" },"
-			<< "   { src: \"" << LmsApp->getImageResource()->getTrackUrl(trackId, 512) << "\", sizes: \"512x512\",	type: \"" << imgResourceMimeType << "\" },"
+			<< "   { src: \"" << LmsApp->getImageResource()->getTrackUrl(trackId, ImageResource::Size::Small) << "\", sizes: \"128x128\",	type: \"" << imgResourceMimeType << "\" },"
+			<< "   { src: \"" << LmsApp->getImageResource()->getTrackUrl(trackId, ImageResource::Size::Large) << "\", sizes: \"512x512\",	type: \"" << imgResourceMimeType << "\" },"
 			<< " ]"
 			<< "};";
 		oss << "LMS.mediaplayer.loadTrack(params, " << (play ? "true" : "false") << ")"; // true to autoplay
diff --git a/src/lms/ui/PlayQueueView.cpp b/src/lms/ui/PlayQueue.cpp
similarity index 88%
rename from src/lms/ui/PlayQueueView.cpp
rename to src/lms/ui/PlayQueue.cpp
index 34c82186..04a895b7 100644
--- a/src/lms/ui/PlayQueueView.cpp
+++ b/src/lms/ui/PlayQueue.cpp
@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "PlayQueueView.hpp"
+#include "PlayQueue.hpp"
 
 #include <Wt/WText.h>
 #include <Wt/WText.h>
@@ -50,8 +50,15 @@ PlayQueue::PlayQueue()
 		_radioMode = LmsApp->getUser()->isRadioSet();
 	}
 
+	auto setToolTip = [](Wt::WWidget& widget, Wt::WString title)
+	{
+		widget.setAttributeValue("data-toggle", "tooltip");
+		widget.setAttributeValue("data-placement", "bottom");
+		widget.setAttributeValue("title", std::move(title));
+	};
+
 	Wt::WText* clearBtn = bindNew<Wt::WText>("clear-btn", Wt::WString::tr("Lms.PlayQueue.template.clear-btn"), Wt::TextFormat::XHTML);
-	clearBtn->setToolTip(Wt::WString::tr("Lms.PlayQueue.clear"));
+	setToolTip(*clearBtn, Wt::WString::tr("Lms.PlayQueue.clear"));
 	clearBtn->clicked().connect([=]
 	{
 		clearTracks();
@@ -68,7 +75,7 @@ PlayQueue::PlayQueue()
 	});
 
 	Wt::WText* shuffleBtn = bindNew<Wt::WText>("shuffle-btn", Wt::WString::tr("Lms.PlayQueue.template.shuffle-btn"), Wt::TextFormat::XHTML);
-	shuffleBtn->setToolTip(Wt::WString::tr("Lms.PlayQueue.shuffle"));
+	setToolTip(*shuffleBtn, Wt::WString::tr("Lms.PlayQueue.shuffle"));
 	shuffleBtn->clicked().connect([=]
 	{
 		{
@@ -87,7 +94,7 @@ PlayQueue::PlayQueue()
 	});
 
 	_repeatBtn = bindNew<Wt::WText>("repeat-btn", Wt::WString::tr("Lms.PlayQueue.template.repeat-btn"), Wt::TextFormat::XHTML);
-	_repeatBtn->setToolTip(Wt::WString::tr("Lms.PlayQueue.repeat"));
+	setToolTip(*_repeatBtn, Wt::WString::tr("Lms.PlayQueue.repeat"));
 	_repeatBtn->clicked().connect([=]
 	{
 		_repeatAll = !_repeatAll;
@@ -101,7 +108,7 @@ PlayQueue::PlayQueue()
 	updateRepeatBtn();
 
 	_radioBtn = bindNew<Wt::WText>("radio-btn", Wt::WString::tr("Lms.PlayQueue.template.radio-btn"));
-	_radioBtn->setToolTip(Wt::WString::tr("Lms.PlayQueue.radio-mode"));
+	setToolTip(*_radioBtn, Wt::WString::tr("Lms.PlayQueue.radio-mode"));
 	_radioBtn->clicked().connect([=]
 	{
 		_radioMode = !_radioMode;
@@ -136,7 +143,7 @@ PlayQueue::PlayQueue()
 
 		if (!LmsApp->getUser()->isDemo())
 		{
-			LmsApp->getMediaPlayer()->settingsLoaded.connect([=]
+			LmsApp->getMediaPlayer().settingsLoaded.connect([=]
 			{
 				if (_mediaPlayerSettingsLoaded)
 					return;
@@ -327,20 +334,27 @@ PlayQueue::enqueueTrack(Database::IdType trackId)
 }
 
 void
-PlayQueue::addTracks(const std::vector<Database::IdType>& trackIds)
+PlayQueue::processTracks(PlayQueueAction action, const std::vector<Database::IdType>& trackIds)
 {
-	enqueueTracks(trackIds);
-	LmsApp->notifyMsg(MsgType::Info, Wt::WString::trn("Lms.PlayQueue.nb-tracks-added", trackIds.size()).arg(trackIds.size()), std::chrono::milliseconds(2000));
-}
+	switch (action)
+	{
+		case PlayQueueAction::AddLast:
+			enqueueTracks(trackIds);
+			LmsApp->notifyMsg(MsgType::Info, Wt::WString::trn("Lms.PlayQueue.nb-tracks-added", trackIds.size()).arg(trackIds.size()), std::chrono::milliseconds(2000));
+			break;
 
-void
-PlayQueue::playTracks(const std::vector<Database::IdType>& trackIds)
-{
-	clearTracks();
-	enqueueTracks(trackIds);
-	loadTrack(0, true);
+		case PlayQueueAction::AddNext:
+			break;
 
-	LmsApp->notifyMsg(MsgType::Info, Wt::WString::trn("Lms.PlayQueue.nb-tracks-playing", trackIds.size()).arg(trackIds.size()), std::chrono::milliseconds(2000));
+		case PlayQueueAction::Play:
+			clearTracks();
+			enqueueTracks(trackIds);
+			loadTrack(0, true);
+
+			LmsApp->notifyMsg(MsgType::Info, Wt::WString::trn("Lms.PlayQueue.nb-tracks-playing", trackIds.size()).arg(trackIds.size()), std::chrono::milliseconds(2000));
+			break;
+
+	}
 }
 
 void
@@ -384,16 +398,18 @@ PlayQueue::addSome()
 			{
 				Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false));
 				auto cover = std::make_unique<Wt::WImage>();
-				cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 96));
-				cover->setStyleClass("Lms-cover-small");
+				cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), ImageResource::Size::Large));
+				cover->setStyleClass("Lms-cover");
+				cover->setAttributeValue("onload", LmsApp->javaScriptClass() + ".onLoadCover(this)");
 				anchor->setImage(std::move(cover));
 			}
 		}
 		else
 		{
 			auto cover = entry->bindNew<Wt::WImage>("cover");
-			cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(track.id(), 96));
-			cover->setStyleClass("Lms-cover-small");
+			cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(track.id(), ImageResource::Size::Large));
+			cover->setStyleClass("Lms-cover");
+			cover->setAttributeValue("onload", LmsApp->javaScriptClass() + ".onLoadCover(this)");
 		}
 
 		entry->bindString("duration", trackDurationToString(track->getDuration()), Wt::TextFormat::Plain);
@@ -444,7 +460,7 @@ PlayQueue::enqueueRadioTrack()
 std::optional<float>
 PlayQueue::getReplayGain(std::size_t pos, const Database::Track::pointer& track) const
 {
-	const auto& settings {LmsApp->getMediaPlayer()->getSettings()};
+	const auto& settings {LmsApp->getMediaPlayer().getSettings()};
 	if (!settings)
 		return std::nullopt;
 
diff --git a/src/lms/ui/PlayQueueView.hpp b/src/lms/ui/PlayQueue.hpp
similarity index 95%
rename from src/lms/ui/PlayQueueView.hpp
rename to src/lms/ui/PlayQueue.hpp
index 4e92c2fe..a2088ecd 100644
--- a/src/lms/ui/PlayQueueView.hpp
+++ b/src/lms/ui/PlayQueue.hpp
@@ -27,6 +27,7 @@
 #include <Wt/WText.h>
 
 #include "database/Types.hpp"
+#include "PlayQueueAction.hpp"
 
 namespace Similarity {
 	class Finder;
@@ -44,8 +45,7 @@ class PlayQueue : public Wt::WTemplate
 	public:
 		PlayQueue();
 
-		void addTracks(const std::vector<Database::IdType>& trackIds);
-		void playTracks(const std::vector<Database::IdType>& trackIds);
+		void processTracks(PlayQueueAction action, const std::vector<Database::IdType>& trackIds);
 
 		// play the next track in the queue
 		void playNext();
diff --git a/src/lms/ui/PlayQueueAction.hpp b/src/lms/ui/PlayQueueAction.hpp
new file mode 100644
index 00000000..2892537b
--- /dev/null
+++ b/src/lms/ui/PlayQueueAction.hpp
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2020 Emeric Poupon
+ *
+ * This file is part of LMS.
+ *
+ * LMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+namespace UserInterface
+{
+
+	enum class PlayQueueAction
+	{
+		Play,
+		AddNext,
+		AddLast,
+	};
+
+}
+
diff --git a/src/lms/ui/SettingsView.cpp b/src/lms/ui/SettingsView.cpp
index 20953588..30d8a401 100644
--- a/src/lms/ui/SettingsView.cpp
+++ b/src/lms/ui/SettingsView.cpp
@@ -156,7 +156,7 @@ class SettingsModel : public Wt::WFormModel
 				settings.replayGain.preAmpGain = Wt::asNumber(value(ReplayGainPreAmpGainField));
 				settings.replayGain.preAmpGainIfNoInfo = Wt::asNumber(value(ReplayGainPreAmpGainIfNoInfoField));
 
-				LmsApp->getMediaPlayer()->setSettings(settings);
+				LmsApp->getMediaPlayer().setSettings(settings);
 			}
 
 			{
@@ -191,7 +191,7 @@ class SettingsModel : public Wt::WFormModel
 			setValue(DarkModeField, user->getUITheme() == User::UITheme::Dark);
 
 			{
-				const auto settings {*LmsApp->getMediaPlayer()->getSettings()};
+				const auto settings {*LmsApp->getMediaPlayer().getSettings()};
 
 				auto transcodeModeRow {_transcodeModeModel->getRowFromValue(settings.transcode.mode)};
 				if (transcodeModeRow)
@@ -350,7 +350,7 @@ SettingsView::SettingsView()
 		refreshView();
 	});
 
-	LmsApp->getMediaPlayer()->settingsLoaded.connect([=]()
+	LmsApp->getMediaPlayer().settingsLoaded.connect([=]()
 	{
 		refreshView();
 	});
@@ -367,7 +367,7 @@ SettingsView::refreshView()
 	clear();
 
 	// Hack to wait for the audio player know the settings applied
-	if (!LmsApp->getMediaPlayer()->getSettings())
+	if (!LmsApp->getMediaPlayer().getSettings())
 		return;
 
 	auto t {addNew<Wt::WTemplateFormView>(Wt::WString::tr("Lms.Settings.template"))};
@@ -426,7 +426,7 @@ SettingsView::refreshView()
 			t->updateModel(model.get());
 			t->updateView(model.get());
 		});
-		if (LmsApp->getMediaPlayer()->getSettings()->transcode.mode == MediaPlayer::Settings::Transcode::Mode::Never)
+		if (LmsApp->getMediaPlayer().getSettings()->transcode.mode == MediaPlayer::Settings::Transcode::Mode::Never)
 		{
 			model->setReadOnly(SettingsModel::TranscodeFormatField, true);
 			model->setReadOnly(SettingsModel::TranscodeBitrateField, true);
@@ -456,7 +456,7 @@ SettingsView::refreshView()
 			t->updateModel(model.get());
 			t->updateView(model.get());
 		});
-		if (LmsApp->getMediaPlayer()->getSettings()->replayGain.mode == MediaPlayer::Settings::ReplayGain::Mode::None)
+		if (LmsApp->getMediaPlayer().getSettings()->replayGain.mode == MediaPlayer::Settings::ReplayGain::Mode::None)
 		{
 			model->setReadOnly(SettingsModel::SettingsModel::ReplayGainPreAmpGainField, true);
 			model->setReadOnly(SettingsModel::SettingsModel::ReplayGainPreAmpGainIfNoInfoField, true);
diff --git a/src/lms/ui/explore/ArtistView.cpp b/src/lms/ui/explore/ArtistView.cpp
index 8323ace1..bdbe5602 100644
--- a/src/lms/ui/explore/ArtistView.cpp
+++ b/src/lms/ui/explore/ArtistView.cpp
@@ -32,11 +32,11 @@
 #include "utils/String.hpp"
 
 #include "resource/ImageResource.hpp"
-
 #include "ArtistListHelpers.hpp"
+#include "Filters.hpp"
 #include "LmsApplication.hpp"
 #include "LmsApplicationException.hpp"
-#include "Filters.hpp"
+#include "ReleaseListHelpers.hpp"
 
 using namespace Database;
 
@@ -77,10 +77,11 @@ Artist::refreshView()
 
     auto transaction {LmsApp->getDbSession().createSharedTransaction()};
 
-	const Database::Artist::pointer artist = Database::Artist::getById(LmsApp->getDbSession(), *artistId);
+	const Database::Artist::pointer artist {Database::Artist::getById(LmsApp->getDbSession(), *artistId)};
 	if (!artist)
 		throw ArtistNotFoundException {*artistId};
 
+	refreshLinks(artist);
 	refreshSimilarArtists(similarArtistIds);
 
 	Wt::WContainerWidget* clusterContainers = bindNew<Wt::WContainerWidget>("clusters");
@@ -109,7 +110,7 @@ Artist::refreshView()
 
 		playBtn->clicked().connect([=]
 		{
-			artistsPlay.emit({*artistId});
+			artistsAction.emit(PlayQueueAction::Play, {*artistId});
 		});
 	}
 
@@ -118,7 +119,7 @@ Artist::refreshView()
 
 		addBtn->clicked().connect([=]
 		{
-			artistsAdd.emit({*artistId});
+			artistsAction.emit(PlayQueueAction::AddLast, {*artistId});
 		});
 	}
 
@@ -127,79 +128,14 @@ Artist::refreshView()
 	auto releases = artist->getReleases(_filters->getClusterIds());
 	for (const auto& release : releases)
 	{
-		releasesContainer->addWidget(createRelease(artist, release));
+		releasesContainer->addWidget(ReleaseListHelpers::createEntryForArtist(release, artist));
 	}
 }
 
-std::unique_ptr<Wt::WTemplate>
-Artist::createRelease(const Database::Artist::pointer& artist, const Release::pointer& release)
-{
-	auto releaseId = release.id();
-
-	auto entry = std::make_unique<Wt::WTemplate>(Wt::WString::tr("Lms.Explore.Artist.template.entry"));
-	entry->addFunction("tr", Wt::WTemplate::Functions::tr);
-
-	{
-		Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false));
-
-		auto cover = std::make_unique<Wt::WImage>();
-		cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 128));
-		cover->setStyleClass("Lms-cover");
-		anchor->setImage(std::move(cover));
-	}
-
-	entry->bindWidget("name", LmsApplication::createReleaseAnchor(release));
-
-	auto artists {release->getReleaseArtists()};
-	if (artists.empty())
-		artists = release->getArtists();
-
-	bool isSameArtist {(std::find(std::cbegin(artists), std::cend(artists), artist) != artists.end())};
-
-	if (artists.size() > 1)
-	{
-		entry->setCondition("if-has-artist", true);
-		entry->bindNew<Wt::WText>("artist", Wt::WString::tr("Lms.Explore.various-artists"));
-	}
-	else if (artists.size() == 1 && !isSameArtist)
-	{
-		entry->setCondition("if-has-artist", true);
-		entry->bindWidget("artist", LmsApplication::createArtistAnchor(artists.front()));
-	}
-
-	std::optional<int> year {release->getReleaseYear()};
-	if (year)
-	{
-		entry->setCondition("if-has-year", true);
-		entry->bindInt("year", *year);
-
-		std::optional<int> originalYear {release->getReleaseYear(true)};
-		if (originalYear && *originalYear != *year)
-		{
-			entry->setCondition("if-has-orig-year", true);
-			entry->bindInt("orig-year", *originalYear);
-		}
-	}
-
-	Wt::WText* playBtn = entry->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML);
-	playBtn->clicked().connect([=]
-	{
-		releasesPlay.emit({releaseId});
-	});
-
-	Wt::WText* addBtn = entry->bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML);
-	addBtn->clicked().connect([=]
-	{
-		releasesAdd.emit({releaseId});
-	});
-
-	return entry;
-}
-
 void
 Artist::refreshSimilarArtists(const std::vector<Database::IdType>& similarArtistsId)
 {
-	auto* similarArtistsContainer {bindNew<Wt::WContainerWidget>("similar-artists")};
+	Wt::WContainerWidget* similarArtistsContainer {bindNew<Wt::WContainerWidget>("similar-artists")};
 
 	for (Database::IdType artistId : similarArtistsId)
 	{
@@ -211,5 +147,20 @@ Artist::refreshSimilarArtists(const std::vector<Database::IdType>& similarArtist
 	}
 }
 
+void
+Artist::refreshLinks(const Database::Artist::pointer& artist)
+{
+	const auto mbid {artist->getMBID()};
+	if (mbid)
+	{
+		setCondition("if-has-mbid", true);
+
+		Wt::WLink link {"https://musicbrainz.org/artist/" + std::string {mbid->getAsString()}};
+		link.setTarget(Wt::LinkTarget::NewWindow);
+
+		bindNew<Wt::WAnchor>("mbid-link", link, Wt::WString::tr("Lms.Explore.musicbrainz-artist"));
+	}
+}
+
 } // namespace UserInterface
 
diff --git a/src/lms/ui/explore/ArtistView.hpp b/src/lms/ui/explore/ArtistView.hpp
index cfad36d6..944c9504 100644
--- a/src/lms/ui/explore/ArtistView.hpp
+++ b/src/lms/ui/explore/ArtistView.hpp
@@ -25,6 +25,7 @@
 #include <Wt/WTemplate.h>
 
 #include "database/Types.hpp"
+#include "PlayQueueAction.hpp"
 
 namespace Database
 {
@@ -41,15 +42,12 @@ class Artist : public Wt::WTemplate
 	public:
 		Artist(Filters* filters);
 
-		Wt::Signal<const std::vector<Database::IdType>&> artistsAdd;
-		Wt::Signal<const std::vector<Database::IdType>&> artistsPlay;
-
-		Wt::Signal<const std::vector<Database::IdType>&> releasesAdd;
-		Wt::Signal<const std::vector<Database::IdType>&> releasesPlay;
+		Wt::Signal<PlayQueueAction, const std::vector<Database::IdType>&> artistsAction;
 
 	private:
 		void refreshView();
 		void refreshSimilarArtists(const std::vector<Database::IdType>& similarArtistsId);
+		void refreshLinks(const Wt::Dbo::ptr<Database::Artist>& artist);
 
 		std::unique_ptr<Wt::WTemplate> createRelease(const Wt::Dbo::ptr<Database::Artist>& artist, const Wt::Dbo::ptr<Database::Release>& release);
 
diff --git a/src/lms/ui/explore/ArtistsView.cpp b/src/lms/ui/explore/ArtistsView.cpp
index abb90172..a2fae1f5 100644
--- a/src/lms/ui/explore/ArtistsView.cpp
+++ b/src/lms/ui/explore/ArtistsView.cpp
@@ -140,7 +140,7 @@ Artists::getArtists(std::optional<Range> range, bool& moreResults)
 	if (modeLimit)
 	{
 		if (range)
-			range->limit = std::min(*modeLimit - range->offset, range->offset + range->limit);
+			range->limit = std::min(*modeLimit - range->offset, range->limit);
 		else
 			range = Range {0, *modeLimit};
 	}
diff --git a/src/lms/ui/explore/ArtistsView.hpp b/src/lms/ui/explore/ArtistsView.hpp
index 8fd173f2..546290eb 100644
--- a/src/lms/ui/explore/ArtistsView.hpp
+++ b/src/lms/ui/explore/ArtistsView.hpp
@@ -69,7 +69,7 @@ class Artists : public Wt::WTemplate
 			{Mode::RecentlyPlayed, batchSize * 4},
 			{Mode::RecentlyAdded, batchSize * 2},
 			{Mode::MostPlayed, batchSize * 2},
-			{Mode::All, std::nullopt},
+			{Mode::All, batchSize * 50},
 		};
 
 		Mode _mode {defaultMode};
diff --git a/src/lms/ui/explore/Explore.cpp b/src/lms/ui/explore/Explore.cpp
index 72c7ca1d..463ea8fd 100644
--- a/src/lms/ui/explore/Explore.cpp
+++ b/src/lms/ui/explore/Explore.cpp
@@ -88,27 +88,20 @@ Explore::Explore(Filters* filters)
 	contentsStack->addWidget(std::move(artists));
 
 	auto artist = std::make_unique<Artist>(_filters);
-	artist->artistsAdd.connect(this, &Explore::handleArtistsAdd);
-	artist->artistsPlay.connect(this, &Explore::handleArtistsPlay);
-	artist->releasesAdd.connect(this, &Explore::handleReleasesAdd);
-	artist->releasesPlay.connect(this, &Explore::handleReleasesPlay);
+	artist->artistsAction.connect(this, &Explore::handleArtistsAction);
 	contentsStack->addWidget(std::move(artist));
 
 	auto releases = std::make_unique<Releases>(_filters);
-	releases->releasesAdd.connect(this, &Explore::handleReleasesAdd);
-	releases->releasesPlay.connect(this, &Explore::handleReleasesPlay);
+	releases->releasesAction.connect(this, &Explore::handleReleasesAction);
 	contentsStack->addWidget(std::move(releases));
 
 	auto release = std::make_unique<Release>(_filters);
-	release->releasesAdd.connect(this, &Explore::handleReleasesAdd);
-	release->releasesPlay.connect(this, &Explore::handleReleasesPlay);
-	release->tracksAdd.connect(this, &Explore::handleTracksAdd);
-	release->tracksPlay.connect(this, &Explore::handleTracksPlay);
+	release->releasesAction.connect(this, &Explore::handleReleasesAction);
+	release->tracksAction.connect(this, &Explore::handleTracksAction);
 	contentsStack->addWidget(std::move(release));
 
 	auto tracks = std::make_unique<Tracks>(_filters);
-	tracks->tracksAdd.connect(this, &Explore::handleTracksAdd);
-	tracks->tracksPlay.connect(this, &Explore::handleTracksPlay);
+	tracks->tracksAction.connect(this, &Explore::handleTracksAction);
 	contentsStack->addWidget(std::move(tracks));
 
 	wApp->internalPathChanged().connect([=]
@@ -167,40 +160,23 @@ getReleasesTracks(Database::Session& session, const std::vector<Database::IdType
 }
 
 void
-Explore::handleArtistsAdd(const std::vector<Database::IdType>& artistsId)
+Explore::handleArtistsAction(PlayQueueAction action, const std::vector<Database::IdType>& artistsId)
 {
-	tracksAdd.emit(getArtistsTracks(LmsApp->getDbSession(), artistsId, _filters->getClusterIds()));
+	tracksAction.emit(action, getArtistsTracks(LmsApp->getDbSession(), artistsId, _filters->getClusterIds()));
 }
 
 void
-Explore::handleArtistsPlay(const std::vector<Database::IdType>& artistsId)
+Explore::handleReleasesAction(PlayQueueAction action, const std::vector<Database::IdType>& releasesId)
 {
-	tracksPlay.emit(getArtistsTracks(LmsApp->getDbSession(), artistsId, _filters->getClusterIds()));
+	tracksAction.emit(action, getReleasesTracks(LmsApp->getDbSession(), releasesId, _filters->getClusterIds()));
 }
 
 void
-Explore::handleReleasesAdd(const std::vector<Database::IdType>& releasesId)
+Explore::handleTracksAction(PlayQueueAction action, const std::vector<Database::IdType>& tracksId)
 {
-	tracksAdd.emit(getReleasesTracks(LmsApp->getDbSession(), releasesId, _filters->getClusterIds()));
+	tracksAction.emit(action, tracksId);
 }
 
-void
-Explore::handleReleasesPlay(const std::vector<Database::IdType>& releasesId)
-{
-	tracksPlay.emit(getReleasesTracks(LmsApp->getDbSession(), releasesId, _filters->getClusterIds()));
-}
-
-void
-Explore::handleTracksAdd(const std::vector<Database::IdType>& tracksId)
-{
-	tracksAdd.emit(tracksId);
-}
-
-void
-Explore::handleTracksPlay(const std::vector<Database::IdType>& tracksId)
-{
-	tracksPlay.emit(tracksId);
-}
 
 } // namespace UserInterface
 
diff --git a/src/lms/ui/explore/Explore.hpp b/src/lms/ui/explore/Explore.hpp
index 676269f3..7f476f64 100644
--- a/src/lms/ui/explore/Explore.hpp
+++ b/src/lms/ui/explore/Explore.hpp
@@ -22,6 +22,7 @@
 #include <Wt/WTemplate.h>
 
 #include "database/Types.hpp"
+#include "PlayQueueAction.hpp"
 
 namespace UserInterface {
 
@@ -32,17 +33,13 @@ class Explore : public Wt::WTemplate
 	public:
 		Explore(Filters* filters);
 
-		Wt::Signal<std::vector<Database::IdType>> tracksAdd;
-		Wt::Signal<std::vector<Database::IdType>> tracksPlay;
+		Wt::Signal<PlayQueueAction, const std::vector<Database::IdType>&> tracksAction;
 
 	private:
 
-		void handleArtistsAdd(const std::vector<Database::IdType>& artistsId);
-		void handleArtistsPlay(const std::vector<Database::IdType>& artistsId);
-		void handleReleasesAdd(const std::vector<Database::IdType>& releasesId);
-		void handleReleasesPlay(const std::vector<Database::IdType>& releasesId);
-		void handleTracksAdd(const std::vector<Database::IdType>& tracksId);
-		void handleTracksPlay(const std::vector<Database::IdType>& tracksId);
+		void handleArtistsAction(PlayQueueAction action, const std::vector<Database::IdType>& artistsId);
+		void handleReleasesAction(PlayQueueAction action, const std::vector<Database::IdType>& releasesId);
+		void handleTracksAction(PlayQueueAction action, const std::vector<Database::IdType>& tracksId);
 
 		Filters* _filters {};
 };
diff --git a/src/lms/ui/explore/ReleaseListHelpers.cpp b/src/lms/ui/explore/ReleaseListHelpers.cpp
index bf62d015..b77945dc 100644
--- a/src/lms/ui/explore/ReleaseListHelpers.cpp
+++ b/src/lms/ui/explore/ReleaseListHelpers.cpp
@@ -23,6 +23,7 @@
 #include <Wt/WImage.h>
 #include <Wt/WText.h>
 
+#include "database/Artist.hpp"
 #include "database/Release.hpp"
 #include "resource/ImageResource.hpp"
 
@@ -33,36 +34,76 @@ using namespace Database;
 namespace UserInterface::ReleaseListHelpers
 {
 
+	static
 	std::unique_ptr<Wt::WTemplate>
-	createEntrySmall(const Database::Release::pointer& release)
+	createEntryInternal(const Release::pointer& release, const std::string& templateKey, const Artist::pointer& artist, const bool showYear)
 	{
-		auto entry {std::make_unique<Wt::WTemplate>(Wt::WString::tr("Lms.Explore.Releases.template.entry-small"))};
+		auto entry {std::make_unique<Wt::WTemplate>(Wt::WString::tr(templateKey))};
 
 		entry->bindWidget("release-name", LmsApplication::createReleaseAnchor(release));
 
 		Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false));
 		auto cover = std::make_unique<Wt::WImage>();
-		cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 64));
+		cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), ImageResource::Size::Large));
 		cover->setStyleClass("Lms-cover");
+		cover->setAttributeValue("onload", LmsApp->javaScriptClass() + ".onLoadCover(this)");
 		anchor->setImage(std::move(cover));
 
 		auto artists = release->getReleaseArtists();
 		if (artists.empty())
 			artists = release->getArtists();
 
+		bool isSameArtist {(std::find(std::cbegin(artists), std::cend(artists), artist) != artists.end())};
+
 		if (artists.size() > 1)
 		{
 			entry->setCondition("if-has-artist", true);
 			entry->bindNew<Wt::WText>("artist-name", Wt::WString::tr("Lms.Explore.various-artists"));
 		}
-		else if (artists.size() == 1)
+		else if (artists.size() == 1 && !isSameArtist)
 		{
 			entry->setCondition("if-has-artist", true);
 			entry->bindWidget("artist-name", LmsApplication::createArtistAnchor(artists.front()));
 		}
 
+		if (showYear)
+		{
+			if (std::optional<int> year {release->getReleaseYear()})
+			{
+				entry->setCondition("if-has-year", true);
+
+				std::string strYear {std::to_string(*year)};
+
+				std::optional<int> originalYear {release->getReleaseYear(true)};
+				if (originalYear && *originalYear != *year)
+				{
+					strYear += " (" + std::to_string(*originalYear) + ")";
+				}
+
+				entry->bindString("year", strYear);
+			}
+		}
+
 		return entry;
 	}
 
+	std::unique_ptr<Wt::WTemplate>
+	createEntry(const Release::pointer& release, const Artist::pointer& artist, bool showYear)
+	{
+		return createEntryInternal(release, "Lms.Explore.Releases.template.entry-grid", artist, showYear);
+	}
+
+	std::unique_ptr<Wt::WTemplate>
+	createEntry(const Release::pointer& release)
+	{
+		return createEntry(release, Artist::pointer {}, false /*year*/);
+	}
+
+	std::unique_ptr<Wt::WTemplate>
+	createEntryForArtist(const Wt::Dbo::ptr<Database::Release>& release, const Wt::Dbo::ptr<Database::Artist>& artist)
+	{
+		return createEntry(release, artist, true);
+	}
+
 } // namespace UserInterface
 
diff --git a/src/lms/ui/explore/ReleaseListHelpers.hpp b/src/lms/ui/explore/ReleaseListHelpers.hpp
index 81cb266f..31a936e6 100644
--- a/src/lms/ui/explore/ReleaseListHelpers.hpp
+++ b/src/lms/ui/explore/ReleaseListHelpers.hpp
@@ -25,13 +25,13 @@
 
 namespace Database
 {
+	class Artist;
 	class Release;
 }
 
 namespace UserInterface::ReleaseListHelpers
 {
-
-	std::unique_ptr<Wt::WTemplate> createEntrySmall(const Wt::Dbo::ptr<Database::Release>& release);
-
+	std::unique_ptr<Wt::WTemplate> createEntry(const Wt::Dbo::ptr<Database::Release>& release);
+	std::unique_ptr<Wt::WTemplate> createEntryForArtist(const Wt::Dbo::ptr<Database::Release>& release, const Wt::Dbo::ptr<Database::Artist>& artist);
 } // namespace UserInterface
 
diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp
index 44504b07..e19f83f9 100644
--- a/src/lms/ui/explore/ReleaseView.cpp
+++ b/src/lms/ui/explore/ReleaseView.cpp
@@ -22,6 +22,7 @@
 #include <Wt/WAnchor.h>
 #include <Wt/WApplication.h>
 #include <Wt/WImage.h>
+#include <Wt/WPopupMenu.h>
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
 
@@ -75,7 +76,7 @@ Release::refreshView()
 	if (!releaseId)
 		return;
 
-	const std::vector<Database::IdType> similarReleasesIds {ServiceProvider<Recommendation::IEngine>::get()->getSimilarReleases(LmsApp->getDbSession(), *releaseId, 5)};
+	const std::vector<Database::IdType> similarReleasesIds {ServiceProvider<Recommendation::IEngine>::get()->getSimilarReleases(LmsApp->getDbSession(), *releaseId, 6)};
 
     auto transaction {LmsApp->getDbSession().createSharedTransaction()};
 
@@ -84,6 +85,7 @@ Release::refreshView()
 		throw ReleaseNotFoundException {*releaseId};
 
 	refreshCopyright(release);
+	refreshLinks(release);
 	refreshSimilarReleases(similarReleasesIds);
 
 	bindString("name", Wt::WString::fromUTF8(release->getName()), Wt::TextFormat::Plain);
@@ -122,8 +124,9 @@ Release::refreshView()
 	}
 
 	{
-		Wt::WImage* cover {bindNew<Wt::WImage>("cover", Wt::WLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 512)))};
+		Wt::WImage* cover {bindNew<Wt::WImage>("cover", Wt::WLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), ImageResource::Size::Large)))};
 		cover->setStyleClass("Lms-cover-large");
+		cover->setAttributeValue("onload", LmsApp->javaScriptClass() + ".onLoadCover(this)");
 	}
 
 	Wt::WContainerWidget* clusterContainers {bindNew<Wt::WContainerWidget>("clusters")};
@@ -149,7 +152,7 @@ Release::refreshView()
 		Wt::WText* playBtn {bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML)};
 		playBtn->clicked().connect([=]
 		{
-			releasesPlay.emit({*releaseId});
+			releasesAction.emit(PlayQueueAction::Play, {*releaseId});
 		});
 	}
 
@@ -157,7 +160,7 @@ Release::refreshView()
 		Wt::WText* addBtn {bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML)};
 		addBtn->clicked().connect([=]
 		{
-			releasesAdd.emit({*releaseId});
+			releasesAction.emit(PlayQueueAction::AddLast, {*releaseId});
 		});
 	}
 
@@ -231,27 +234,29 @@ Release::refreshView()
 		Wt::WText* playBtn {entry->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML)};
 		playBtn->clicked().connect([=]()
 		{
-			tracksPlay.emit({trackId});
+			tracksAction.emit(PlayQueueAction::Play, {trackId});
 		});
 
 		Wt::WText* addBtn {entry->bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML)};
 		addBtn->clicked().connect([=]()
 		{
-			tracksAdd.emit({trackId});
+			tracksAction.emit(PlayQueueAction::AddLast, {trackId});
 		});
 
 		entry->bindString("duration", trackDurationToString(track->getDuration()), Wt::TextFormat::Plain);
 
-		LmsApp->getMediaPlayer()->trackLoaded.connect(entry, [=] (Database::IdType loadedTrackId)
+		LmsApp->getMediaPlayer().trackLoaded.connect(entry, [=] (Database::IdType loadedTrackId)
 		{
 			entry->bindString("is-playing", loadedTrackId == trackId ? "Lms-entry-playing" : "");
 		});
 
-		if (auto trackIdLoaded {LmsApp->getMediaPlayer()->getTrackLoaded()})
+		if (auto trackIdLoaded {LmsApp->getMediaPlayer().getTrackLoaded()})
 		{
 			if (*trackIdLoaded == trackId)
 				entry->bindString("is-playing", "Lms-entry-playing");
 		}
+		else
+			entry->bindString("is-playing", "");
 	}
 }
 
@@ -261,24 +266,40 @@ Release::refreshCopyright(const Database::Release::pointer& release)
 	std::optional<std::string> copyright {release->getCopyright()};
 	std::optional<std::string> copyrightURL {release->getCopyrightURL()};
 
-	setCondition("if-has-copyright-or-copyright-url", copyright || copyrightURL);
+	if (!copyright && !copyrightURL)
+		return;
+
+	setCondition("if-has-copyright", true);
+
+	std::string copyrightText {copyright ? *copyright : ""};
+	if (copyrightText.empty() && copyrightURL)
+		copyrightText = *copyrightURL;
 
 	if (copyrightURL)
 	{
-		setCondition("if-has-copyright-url", true);
-
 		Wt::WLink link {*copyrightURL};
 		link.setTarget(Wt::LinkTarget::NewWindow);
 
-		Wt::WAnchor* anchor {bindNew<Wt::WAnchor>("copyright-url", link)};
-		anchor->setTextFormat(Wt::TextFormat::XHTML);
-		anchor->setText(Wt::WString::tr("Lms.Explore.Release.template.link-btn"));
+		Wt::WAnchor* anchor {bindNew<Wt::WAnchor>("copyright", link)};
+		anchor->setTextFormat(Wt::TextFormat::Plain);
+		anchor->setText(Wt::WString::fromUTF8(copyrightText));
 	}
-
-	if (copyright)
-	{
-		setCondition("if-has-copyright", true);
+	else
 		bindString("copyright", Wt::WString::fromUTF8(*copyright), Wt::TextFormat::Plain);
+}
+
+void
+Release::refreshLinks(const Database::Release::pointer& release)
+{
+	const auto mbid {release->getMBID()};
+	if (mbid)
+	{
+		setCondition("if-has-mbid", true);
+
+		Wt::WLink link {"https://musicbrainz.org/release/" + std::string {mbid->getAsString()}};
+		link.setTarget(Wt::LinkTarget::NewWindow);
+
+		bindNew<Wt::WAnchor>("mbid-link", link, Wt::WString::tr("Lms.Explore.musicbrainz-release"));
 	}
 }
 
@@ -293,7 +314,7 @@ Release::refreshSimilarReleases(const std::vector<Database::IdType>& similarRele
 		if (!similarRelease)
 			continue;
 
-		similarReleasesContainer->addWidget(ReleaseListHelpers::createEntrySmall(similarRelease));
+		similarReleasesContainer->addWidget(ReleaseListHelpers::createEntry(similarRelease));
 	}
 }
 
diff --git a/src/lms/ui/explore/ReleaseView.hpp b/src/lms/ui/explore/ReleaseView.hpp
index 3d84ee14..5f1db58e 100644
--- a/src/lms/ui/explore/ReleaseView.hpp
+++ b/src/lms/ui/explore/ReleaseView.hpp
@@ -23,6 +23,7 @@
 #include <Wt/WTemplate.h>
 
 #include "database/Types.hpp"
+#include "PlayQueueAction.hpp"
 
 namespace Database
 {
@@ -38,15 +39,16 @@ namespace UserInterface
 		public:
 			Release(Filters* filters);
 
-			Wt::Signal<const std::vector<Database::IdType>&> releasesAdd;
-			Wt::Signal<const std::vector<Database::IdType>&> releasesPlay;
+			Wt::Signal<PlayQueueAction, const std::vector<Database::IdType>&> releasesAction;
+			Wt::Signal<PlayQueueAction, const std::vector<Database::IdType>&> tracksAction;
 
-			Wt::Signal<const std::vector<Database::IdType>&> tracksAdd;
-			Wt::Signal<const std::vector<Database::IdType>&> tracksPlay;
+			Wt::Signal<Wt::WWidget&, Database::IdType> createReleaseActionMenu;
+			Wt::Signal<Wt::WWidget&, Database::IdType> createTrackActionMenu;
 
 		private:
 			void refreshView();
 			void refreshCopyright(const Wt::Dbo::ptr<Database::Release>& release);
+			void refreshLinks(const Wt::Dbo::ptr<Database::Release>& release);
 			void refreshSimilarReleases(const std::vector<Database::IdType>& similarReleasesId);
 
 			Filters* _filters {};
diff --git a/src/lms/ui/explore/ReleasesView.cpp b/src/lms/ui/explore/ReleasesView.cpp
index 80cb9625..a6a4e254 100644
--- a/src/lms/ui/explore/ReleasesView.cpp
+++ b/src/lms/ui/explore/ReleasesView.cpp
@@ -29,12 +29,11 @@
 #include "database/Release.hpp"
 #include "database/User.hpp"
 #include "database/TrackList.hpp"
-
 #include "utils/Logger.hpp"
 #include "utils/String.hpp"
 
 #include "resource/ImageResource.hpp"
-
+#include "ReleaseListHelpers.hpp"
 #include "Filters.hpp"
 #include "LmsApplication.hpp"
 
@@ -70,12 +69,12 @@ _filters {filters}
 	Wt::WText* playBtn {bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML)};
 	playBtn->clicked().connect([this]
 	{
-		releasesPlay.emit(getAllReleases());
+		releasesAction.emit(PlayQueueAction::Play, getAllReleases());
 	});
 	Wt::WText* addBtn {bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML)};
 	addBtn->clicked().connect([this]
 	{
-		releasesAdd.emit(getAllReleases());
+		releasesAction.emit(PlayQueueAction::AddLast, getAllReleases());
 	});
 
 	_container = bindNew<Wt::WContainerWidget>("releases");
@@ -106,62 +105,17 @@ Releases::refreshView(Mode mode)
 	refreshView();
 }
 
-std::unique_ptr<Wt::WTemplate>
-Releases::createEntry(const Release::pointer& release)
-{
-	const IdType releaseId {release.id()};
-
-	auto entry = std::make_unique<Wt::WTemplate>(Wt::WString::tr("Lms.Explore.Releases.template.entry"));
-	entry->addFunction("tr", Wt::WTemplate::Functions::tr);
-
-	Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false));
-	auto cover = std::make_unique<Wt::WImage>();
-	cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 128));
-	cover->setStyleClass("Lms-cover");
-	anchor->setImage(std::move(cover));
-
-	entry->bindWidget("release-name", LmsApplication::createReleaseAnchor(release));
-
-	auto artists = release->getReleaseArtists();
-	if (artists.empty())
-		artists = release->getArtists();
-
-	if (artists.size() > 1)
-	{
-		entry->setCondition("if-has-artist", true);
-		entry->bindNew<Wt::WText>("artist-name", Wt::WString::tr("Lms.Explore.various-artists"));
-	}
-	else if (artists.size() == 1)
-	{
-		entry->setCondition("if-has-artist", true);
-		entry->bindWidget("artist-name", LmsApplication::createArtistAnchor(artists.front()));
-	}
-
-	Wt::WText* playBtn = entry->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML);
-	playBtn->clicked().connect([=]
-	{
-		releasesPlay.emit({releaseId});
-	});
-
-	Wt::WText* addBtn = entry->bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML);
-	addBtn->clicked().connect([=]
-	{
-		releasesAdd.emit({releaseId});
-	});
-
-	return entry;
-}
-
 void
 Releases::addSome()
 {
 	bool moreResults {};
 
 	auto transaction {LmsApp->getDbSession().createSharedTransaction()};
+	const auto releases {getReleases(Range {static_cast<std::size_t>(_container->count()), batchSize}, moreResults)};
 
-	for (const Release::pointer& release : getReleases(Range {static_cast<std::size_t>(_container->count()), batchSize}, moreResults))
+	for (const Release::pointer& release : releases)
 	{
-		_container->addWidget(createEntry(release));
+		_container->addWidget(ReleaseListHelpers::createEntry(release));
 	}
 
 	_showMore->setHidden(!moreResults);
@@ -201,7 +155,7 @@ Releases::getReleases(std::optional<Range> range, bool& moreResults)
 	if (modeLimit)
 	{
 		if (range)
-			range->limit = std::min(*modeLimit - range->offset, range->offset + range->limit);
+			range->limit = std::min(*modeLimit - range->offset, range->limit);
 		else
 			range = Range {0, *modeLimit};
 	}
diff --git a/src/lms/ui/explore/ReleasesView.hpp b/src/lms/ui/explore/ReleasesView.hpp
index 2ae8fa9d..e873d2f4 100644
--- a/src/lms/ui/explore/ReleasesView.hpp
+++ b/src/lms/ui/explore/ReleasesView.hpp
@@ -26,6 +26,7 @@
 #include <Wt/WTemplate.h>
 
 #include "database/Types.hpp"
+#include "PlayQueueAction.hpp"
 
 namespace Database
 {
@@ -41,8 +42,7 @@ class Releases : public Wt::WTemplate
 	public:
 		Releases(Filters* filters);
 
-		Wt::Signal<const std::vector<Database::IdType>&> releasesAdd;
-		Wt::Signal<const std::vector<Database::IdType>&> releasesPlay;
+		Wt::Signal<PlayQueueAction, const std::vector<Database::IdType>&> releasesAction;
 
 	private:
 
@@ -61,17 +61,16 @@ class Releases : public Wt::WTemplate
 		std::vector<Wt::Dbo::ptr<Database::Release>> getReleases(std::optional<Database::Range> range, bool& moreResults);
 		std::vector<Wt::Dbo::ptr<Database::Release>> getRandomReleases(std::optional<Database::Range> range, bool& moreResults);
 		std::vector<Database::IdType> getAllReleases();
-		std::unique_ptr<Wt::WTemplate> createEntry(const Wt::Dbo::ptr<Database::Release>& release);
 
 		static constexpr Mode defaultMode {Mode::Random};
-		static constexpr std::size_t batchSize {20};
+		static constexpr std::size_t batchSize {18};
 		static inline std::unordered_map<Mode, std::optional<std::size_t>> maxItemsPerMode
 		{
 			{Mode::Random, batchSize * 6},
 			{Mode::RecentlyPlayed, batchSize * 3},
 			{Mode::RecentlyAdded, batchSize * 2},
 			{Mode::MostPlayed, batchSize * 2},
-			{Mode::All, std::nullopt},
+			{Mode::All, batchSize * 30},
 		};
 
 		Mode _mode {defaultMode};
diff --git a/src/lms/ui/explore/SearchView.cpp b/src/lms/ui/explore/SearchView.cpp
index 371df9b6..6f37b4c6 100644
--- a/src/lms/ui/explore/SearchView.cpp
+++ b/src/lms/ui/explore/SearchView.cpp
@@ -29,63 +29,15 @@
 #include "resource/ImageResource.hpp"
 #include "ArtistListHelpers.hpp"
 #include "Filters.hpp"
-#include "ReleaseListHelpers.hpp"
 #include "LmsApplication.hpp"
+#include "ReleaseListHelpers.hpp"
+#include "TrackListHelpers.hpp"
 
-static constexpr std::size_t maxEntries {5};
+static constexpr std::size_t maxEntries {6};
 
 namespace UserInterface
 {
 
-	static
-	std::unique_ptr<Wt::WTemplate>
-	createTrack(const Database::Track::pointer& track)
-	{
-		auto entry {std::make_unique<Wt::WTemplate>(Wt::WString::tr("Lms.Explore.Search.template.track-entry"))};
-
-		entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::TextFormat::Plain);
-
-		auto artists {track->getArtists()};
-		auto release {track->getRelease()};
-		const auto trackId {track.id()};
-
-		if (!artists.empty() || release)
-			entry->setCondition("if-has-artists-or-release", true);
-
-		if (!artists.empty())
-		{
-			entry->setCondition("if-has-artists", true);
-
-			Wt::WContainerWidget* artistContainer {entry->bindNew<Wt::WContainerWidget>("artists")};
-			for (const auto& artist : artists)
-			{
-				Wt::WTemplate* a {artistContainer->addNew<Wt::WTemplate>(Wt::WString::tr("Lms.Explore.Tracks.template.entry-artist"))};
-				a->bindWidget("artist", LmsApplication::createArtistAnchor(artist));
-			}
-		}
-
-		if (track->getRelease())
-		{
-			entry->setCondition("if-has-release", true);
-			entry->bindWidget("release", LmsApplication::createReleaseAnchor(track->getRelease()));
-			{
-				Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false));
-				auto cover = std::make_unique<Wt::WImage>();
-				cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 96));
-				cover->setStyleClass("Lms-cover");
-				anchor->setImage(std::move(cover));
-			}
-		}
-		else
-		{
-			auto cover = entry->bindNew<Wt::WImage>("cover");
-			cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(trackId, 96));
-			cover->setStyleClass("Lms-cover");
-		}
-
-		return entry;
-	}
-
 	SearchView::SearchView(Filters* filters)
 	: Wt::WTemplate {Wt::WString::tr("Lms.Explore.Search.template")}
 	, _filters {filters}
@@ -155,7 +107,7 @@ namespace UserInterface
 			auto* container {bindNew<Wt::WContainerWidget>("releases")};
 
 			for (const Database::Release::pointer& release : releases)
-				container->addWidget(ReleaseListHelpers::createEntrySmall(release));
+				container->addWidget(ReleaseListHelpers::createEntry(release));
 		}
 	}
 
@@ -175,7 +127,7 @@ namespace UserInterface
 			auto* container {bindNew<Wt::WContainerWidget>("tracks")};
 
 			for (const Database::Track::pointer& track : tracks)
-				container->addWidget(createTrack(track));
+				container->addWidget(TrackListHelpers::createEntry(track));
 		}
 	}
 
diff --git a/src/lms/ui/explore/TrackListHelpers.cpp b/src/lms/ui/explore/TrackListHelpers.cpp
new file mode 100644
index 00000000..3d4ec648
--- /dev/null
+++ b/src/lms/ui/explore/TrackListHelpers.cpp
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2020 Emeric Poupon
+ *
+ * This file is part of LMS.
+ *
+ * LMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "TrackListHelpers.hpp"
+
+#include <Wt/WAnchor.h>
+#include <Wt/WContainerWidget.h>
+#include <Wt/WImage.h>
+#include <Wt/WText.h>
+
+#include "database/Artist.hpp"
+#include "database/Release.hpp"
+#include "database/Track.hpp"
+#include "resource/ImageResource.hpp"
+#include "LmsApplication.hpp"
+#include "MediaPlayer.hpp"
+#include "PlayQueue.hpp"
+#include "TrackStringUtils.hpp"
+
+using namespace Database;
+
+namespace UserInterface::TrackListHelpers
+{
+	std::unique_ptr<Wt::WTemplate>
+	createEntry(const Wt::Dbo::ptr<Database::Track>& track)
+	{
+		auto entry {std::make_unique<Wt::WTemplate>(Wt::WString::tr("Lms.Explore.Tracks.template.entry"))};
+		auto* entryPtr {entry.get()};
+
+		Wt::WText* name {entry->bindNew<Wt::WText>("name", Wt::WString::fromUTF8(track->getName()), Wt::TextFormat::Plain)};
+		name->setToolTip(Wt::WString::fromUTF8(track->getName()));
+
+		const auto artists {track->getArtists()};
+		const Release::pointer release {track->getRelease()};
+		const IdType trackId {track.id()};
+
+		if (!artists.empty() || release)
+			entry->setCondition("if-has-artists-or-release", true);
+
+		if (!artists.empty())
+		{
+			entry->setCondition("if-has-artists", true);
+
+			Wt::WContainerWidget* artistContainer {entry->bindNew<Wt::WContainerWidget>("artists")};
+			for (const Artist::pointer& artist : artists)
+			{
+				Wt::WTemplate* a {artistContainer->addNew<Wt::WTemplate>(Wt::WString::tr("Lms.Explore.Tracks.template.entry-artist"))};
+				a->bindWidget("artist", LmsApplication::createArtistAnchor(artist));
+			}
+		}
+
+		if (track->getRelease())
+		{
+			entry->setCondition("if-has-release", true);
+			entry->bindWidget("release", LmsApplication::createReleaseAnchor(track->getRelease()));
+			{
+				Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false));
+				auto cover = std::make_unique<Wt::WImage>();
+				cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), ImageResource::Size::Large));
+				cover->setStyleClass("Lms-cover");
+				cover->setAttributeValue("onload", LmsApp->javaScriptClass() + ".onLoadCover(this)");
+				anchor->setImage(std::move(cover));
+			}
+		}
+		else
+		{
+			auto cover = entry->bindNew<Wt::WImage>("cover");
+			cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(trackId, ImageResource::Size::Large));
+			cover->setStyleClass("Lms-cover");
+			cover->setAttributeValue("onload", LmsApp->javaScriptClass() + ".onLoadCover(this)");
+		}
+
+		entry->bindString("duration", trackDurationToString(track->getDuration()), Wt::TextFormat::Plain);
+
+		Wt::WText* playBtn = entry->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML);
+		playBtn->clicked().connect([=]
+		{
+			LmsApp->getPlayQueue().processTracks(PlayQueueAction::Play, {trackId});
+		});
+
+		Wt::WText* addBtn = entry->bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML);
+		addBtn->clicked().connect([=]
+		{
+			LmsApp->getPlayQueue().processTracks(PlayQueueAction::AddLast, {trackId});
+		});
+
+		LmsApp->getMediaPlayer().trackLoaded.connect(entryPtr, [=] (Database::IdType loadedTrackId)
+		{
+			entryPtr->bindString("is-playing", loadedTrackId == trackId ? "Lms-entry-playing" : "");
+		});
+
+		if (auto trackIdLoaded {LmsApp->getMediaPlayer().getTrackLoaded()})
+		{
+			entry->bindString("is-playing", *trackIdLoaded == trackId ? "Lms-entry-playing" : "");
+		}
+		else
+			entry->bindString("is-playing", "");
+
+		return entry;
+	}
+
+} // namespace UserInterface
+
diff --git a/src/lms/ui/explore/TrackListHelpers.hpp b/src/lms/ui/explore/TrackListHelpers.hpp
new file mode 100644
index 00000000..2766e3e8
--- /dev/null
+++ b/src/lms/ui/explore/TrackListHelpers.hpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2020 Emeric Poupon
+ *
+ * This file is part of LMS.
+ *
+ * LMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <memory>
+
+#include <Wt/WTemplate.h>
+
+namespace Database
+{
+	class Track;
+}
+
+namespace UserInterface::TrackListHelpers
+{
+	std::unique_ptr<Wt::WTemplate> createEntry(const Wt::Dbo::ptr<Database::Track>& track);
+} // namespace UserInterface
+
diff --git a/src/lms/ui/explore/TracksView.cpp b/src/lms/ui/explore/TracksView.cpp
index 3aca498e..db852f48 100644
--- a/src/lms/ui/explore/TracksView.cpp
+++ b/src/lms/ui/explore/TracksView.cpp
@@ -37,6 +37,7 @@
 #include "Filters.hpp"
 #include "LmsApplication.hpp"
 #include "MediaPlayer.hpp"
+#include "TrackListHelpers.hpp"
 #include "TrackStringUtils.hpp"
 
 using namespace Database;
@@ -71,13 +72,13 @@ _filters {filters}
 	Wt::WText* playBtn = bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML);
 	playBtn->clicked().connect([=]
 	{
-		tracksPlay.emit(getAllTracks());
+		tracksAction.emit(PlayQueueAction::Play, getAllTracks());
 	});
 
 	Wt::WText* addBtn = bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML);
 	addBtn->clicked().connect([=]
 	{
-		tracksAdd.emit(getAllTracks());
+		tracksAction.emit(PlayQueueAction::AddLast, getAllTracks());
 	});
 
 	_tracksContainer = bindNew<Wt::WContainerWidget>("tracks");
@@ -145,7 +146,7 @@ Tracks::getTracks(std::optional<Range> range, bool& moreResults)
 	if (modeLimit)
 	{
 		if (range)
-			range->limit = std::min(*modeLimit - range->offset, range->offset + range->limit);
+			range->limit = std::min(*modeLimit - range->offset, range->limit);
 		else
 			range = Range {0, *modeLimit};
 	}
@@ -194,80 +195,6 @@ Tracks::getAllTracks()
 	return res;
 }
 
-std::unique_ptr<Wt::WTemplate>
-Tracks::createEntry(const Track::pointer& track)
-{
-	auto entry {std::make_unique<Wt::WTemplate>(Wt::WString::tr("Lms.Explore.Tracks.template.entry"))};
-	auto* entryPtr {entry.get()};
-
-	entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::TextFormat::Plain);
-
-	auto artists {track->getArtists()};
-	auto release {track->getRelease()};
-	const auto trackId {track.id()};
-
-	if (!artists.empty() || release)
-		entry->setCondition("if-has-artists-or-release", true);
-
-	if (!artists.empty())
-	{
-		entry->setCondition("if-has-artists", true);
-
-		Wt::WContainerWidget* artistContainer {entry->bindNew<Wt::WContainerWidget>("artists")};
-		for (const auto& artist : artists)
-		{
-			Wt::WTemplate* a {artistContainer->addNew<Wt::WTemplate>(Wt::WString::tr("Lms.Explore.Tracks.template.entry-artist"))};
-			a->bindWidget("artist", LmsApplication::createArtistAnchor(artist));
-		}
-	}
-
-	if (track->getRelease())
-	{
-		entry->setCondition("if-has-release", true);
-		entry->bindWidget("release", LmsApplication::createReleaseAnchor(track->getRelease()));
-		{
-			Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false));
-			auto cover = std::make_unique<Wt::WImage>();
-			cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 96));
-			cover->setStyleClass("Lms-cover");
-			anchor->setImage(std::move(cover));
-		}
-	}
-	else
-	{
-		auto cover = entry->bindNew<Wt::WImage>("cover");
-		cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(trackId, 96));
-		cover->setStyleClass("Lms-cover");
-	}
-
-	entry->bindString("duration", trackDurationToString(track->getDuration()), Wt::TextFormat::Plain);
-
-	Wt::WText* playBtn = entry->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML);
-	playBtn->clicked().connect([=]
-	{
-		tracksPlay.emit({trackId});
-	});
-
-	Wt::WText* addBtn = entry->bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML);
-	addBtn->clicked().connect([=]
-	{
-		tracksAdd.emit({trackId});
-	});
-
-	LmsApp->getMediaPlayer()->trackLoaded.connect(entryPtr, [=] (Database::IdType loadedTrackId)
-	{
-		entryPtr->bindString("is-playing", loadedTrackId == trackId ? "Lms-entry-playing" : "");
-	});
-
-	if (auto trackIdLoaded {LmsApp->getMediaPlayer()->getTrackLoaded()})
-	{
-		if (*trackIdLoaded == trackId)
-			entry->bindString("is-playing", "Lms-entry-playing");
-	}
-
-	return entry;
-}
-
 void
 Tracks::addSome()
 {
@@ -276,7 +203,7 @@ Tracks::addSome()
 	bool moreResults;
 	for (const Track::pointer& track : getTracks(Range {static_cast<std::size_t>(_tracksContainer->count()), batchSize}, moreResults))
 	{
-		_tracksContainer->addWidget(createEntry(track));
+		_tracksContainer->addWidget(TrackListHelpers::createEntry(track));
 	}
 
 	_showMore->setHidden(!moreResults);
diff --git a/src/lms/ui/explore/TracksView.hpp b/src/lms/ui/explore/TracksView.hpp
index 75b69fb2..430f8a41 100644
--- a/src/lms/ui/explore/TracksView.hpp
+++ b/src/lms/ui/explore/TracksView.hpp
@@ -27,6 +27,7 @@
 #include <Wt/WTemplate.h>
 
 #include "database/Types.hpp"
+#include "PlayQueueAction.hpp"
 
 namespace Database
 {
@@ -41,8 +42,7 @@ class Tracks : public Wt::WTemplate
 	public:
 		Tracks(Filters* filters);
 
-		Wt::Signal<const std::vector<Database::IdType>&> tracksAdd;
-		Wt::Signal<const std::vector<Database::IdType>&> tracksPlay;
+		Wt::Signal<PlayQueueAction, const std::vector<Database::IdType>&> tracksAction;
 
 	private:
 
@@ -59,7 +59,6 @@ class Tracks : public Wt::WTemplate
 		void refreshView(Mode mode);
 		void addSome();
 
-		std::unique_ptr<Wt::WTemplate> createEntry(const Wt::Dbo::ptr<Database::Track>& track);
 		std::vector<Wt::Dbo::ptr<Database::Track>> getRandomTracks(std::optional<Database::Range> range, bool& moreResults);
 		std::vector<Wt::Dbo::ptr<Database::Track>> getTracks(std::optional<Database::Range> range, bool& moreResults);
 		std::vector<Database::IdType> getAllTracks();
@@ -72,7 +71,7 @@ class Tracks : public Wt::WTemplate
 			{Mode::RecentlyPlayed, batchSize * 10},
 			{Mode::RecentlyAdded, batchSize * 10},
 			{Mode::MostPlayed, batchSize * 10},
-			{Mode::All, std::nullopt},
+			{Mode::All, batchSize * 50},
 		};
 
 		Mode _mode {defaultMode};
diff --git a/src/lms/ui/resource/ImageResource.cpp b/src/lms/ui/resource/ImageResource.cpp
index 03c059b9..37adb781 100644
--- a/src/lms/ui/resource/ImageResource.cpp
+++ b/src/lms/ui/resource/ImageResource.cpp
@@ -41,15 +41,15 @@ ImageResource::~ImageResource()
 }
 
 std::string
-ImageResource::getReleaseUrl(Database::IdType releaseId, std::size_t size) const
+ImageResource::getReleaseUrl(Database::IdType releaseId, Size size) const
 {
-	return url() + "&releaseid=" + std::to_string(releaseId) + "&size=" + std::to_string(size);
+	return url() + "&releaseid=" + std::to_string(releaseId) + "&size=" + std::to_string(static_cast<std::size_t>(size));
 }
 
 std::string
-ImageResource::getTrackUrl(Database::IdType trackId, std::size_t size) const
+ImageResource::getTrackUrl(Database::IdType trackId, Size size) const
 {
-	return url() + "&trackid=" + std::to_string(trackId) + "&size=" + std::to_string(size);
+	return url() + "&trackid=" + std::to_string(trackId) + "&size=" + std::to_string(static_cast<std::size_t>(size));
 }
 
 void
diff --git a/src/lms/ui/resource/ImageResource.hpp b/src/lms/ui/resource/ImageResource.hpp
index 29b5a595..00865805 100644
--- a/src/lms/ui/resource/ImageResource.hpp
+++ b/src/lms/ui/resource/ImageResource.hpp
@@ -36,8 +36,14 @@ class ImageResource : public Wt::WResource
 
 		~ImageResource();
 
-		std::string getReleaseUrl(Database::IdType releaseId, size_t size) const;
-		std::string getTrackUrl(Database::IdType trackId, size_t size) const;
+		enum class Size : std::size_t
+		{
+			Small = 128,
+			Large = 512,
+		};
+
+		std::string getReleaseUrl(Database::IdType releaseId, Size size) const;
+		std::string getTrackUrl(Database::IdType trackId, Size size) const;
 
 		static std::string getMimeType();
 
diff --git a/src/tools/recommendation/LmsRecommendation.cpp b/src/tools/recommendation/LmsRecommendation.cpp
index 31af307d..dd8a017c 100644
--- a/src/tools/recommendation/LmsRecommendation.cpp
+++ b/src/tools/recommendation/LmsRecommendation.cpp
@@ -37,7 +37,7 @@
 
 static
 void
-dumpRecommendation(Database::Session session, Recommendation::IEngine& engine)
+dumpTracksRecommendation(Database::Session session, Recommendation::IEngine& engine)
 {
 	const std::vector<Database::IdType> trackIds {[&]()
 		{
@@ -69,7 +69,12 @@ dumpRecommendation(Database::Session session, Recommendation::IEngine& engine)
 		for (Database::IdType similarTrackId : engine.getSimilarTracks(session, {trackId}, 3))
 			std::cout << "\t- Similar track '" << trackToString(similarTrackId) << std::endl;
 	}
+}
 
+static
+void
+dumpReleasesRecommendation(Database::Session session, Recommendation::IEngine& engine)
+{
 	const std::vector<Database::IdType> releaseIds = std::invoke([&]()
 			{
 			auto transaction {session.createSharedTransaction()};
@@ -91,7 +96,12 @@ dumpRecommendation(Database::Session session, Recommendation::IEngine& engine)
 		for (Database::IdType similarReleaseId : engine.getSimilarReleases(session, releaseId, 3))
 			std::cout << "\t- Similar release '" << releaseToString(similarReleaseId) << "'" << std::endl;
 	}
+}
 
+static
+void
+dumpArtistsRecommendation(Database::Session session, Recommendation::IEngine& engine)
+{
 	const std::vector<Database::IdType> artistIds = std::invoke([&]()
 			{
 			auto transaction {session.createSharedTransaction()};
@@ -113,10 +123,6 @@ dumpRecommendation(Database::Session session, Recommendation::IEngine& engine)
 		for (Database::IdType similarArtistId : engine.getSimilarArtists(session, artistId, 3))
 			std::cout << "\t- Similar artist '" << artistToString(similarArtistId) << "'" << std::endl;
 	}
-
-
-
-
 }
 
 
@@ -153,7 +159,9 @@ int main(int argc, char *argv[])
 		sem.wait();
 		std::cout << "Recommendation engine loaded!" << std::endl;
 
-		dumpRecommendation(db, *engine);
+		dumpTracksRecommendation(db, *engine);
+		dumpReleasesRecommendation(db, *engine);
+		dumpArtistsRecommendation(db, *engine);
 
 		engine->stop();
 	}