diff --git a/approot/artist.xml b/approot/artist.xml
index 44cb1cd1..12c5c5ff 100644
--- a/approot/artist.xml
+++ b/approot/artist.xml
@@ -36,21 +36,4 @@
 	</div>
 </message>
 
-<message id="Lms.Explore.Artist.template.entry">
-	<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-btn 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>
-
 </messages>
diff --git a/approot/misc.xml b/approot/misc.xml
index 195c305f..4e1cf978 100644
--- a/approot/misc.xml
+++ b/approot/misc.xml
@@ -10,7 +10,7 @@
 </message>
 
 <message id="Lms.infinite-scrolling-container">
-	${elements}
+	${elements class="d-grid gap-3"}
 	${loading-indicator}
 </message>
 
diff --git a/approot/release.xml b/approot/release.xml
index 421271ee..f5ffe1be 100644
--- a/approot/release.xml
+++ b/approot/release.xml
@@ -20,7 +20,7 @@
 				${clusters class="mb-2"}
 				${play-btn class="me-2"}${more-btn}
 			</div>
-			${container}
+			${container class="d-grid gap-3"}
 		</div>
 	</div>
 	<div class="row">
@@ -51,7 +51,7 @@
 
 <message id="Lms.Explore.Release.template.entry-disc">
 	<h4>${disc-title}</h4>
-	${tracks}
+	${tracks class="d-grid gap-1"}
 </message>
 
 <message id="Lms.Explore.Release.template.entry">
diff --git a/approot/tracks.xml b/approot/tracks.xml
index 7b1878c4..471bb3e0 100644
--- a/approot/tracks.xml
+++ b/approot/tracks.xml
@@ -13,25 +13,21 @@
 
 <message id="Lms.Explore.Tracks.template.entry">
 		<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="col-3 col-sm-2 col-md-2">
 				<div class="Lms-responsive-square Lms-cover-container">
 					${cover}
 				</div>
 			</div>
-			<div class="col-xs-7 col-sm-8 col-md-8 Lms-explore-entry-list-text-container">
+			<div class="col-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-btn 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 class="Lms-explore-btn Lms-btn"}${more-btn class="Lms-explore-btn Lms-btn"}
-				</div>
-				<div class="Lms-explore-tracks-entry-duration text-muted">
-					${duration}
-				</div>
+			<div class="col-2 col-sm-2 col-md-2">
+				${duration}
+				${play-btn class="me-2"}${more-btn}
 			</div>
 		</div>
 </message>
diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp
index 13ac9672..3b8d5431 100644
--- a/src/lms/ui/explore/ReleaseView.cpp
+++ b/src/lms/ui/explore/ReleaseView.cpp
@@ -135,7 +135,7 @@ Release::refreshView()
 
 	{
 		Wt::WImage* cover {bindNew<Wt::WImage>("cover", Wt::WLink(LmsApp->getCoverResource()->getReleaseUrl(release->getId(), CoverResource::Size::Large)))};
-		cover->setStyleClass("Lms-cover-large");
+		cover->setStyleClass("img-fluid");
 		cover->setAttributeValue("onload", LmsApp->javaScriptClass() + ".onLoadCover(this)");
 	}
 
diff --git a/src/lms/ui/explore/TrackListHelpers.cpp b/src/lms/ui/explore/TrackListHelpers.cpp
index 49509385..5f7f3320 100644
--- a/src/lms/ui/explore/TrackListHelpers.cpp
+++ b/src/lms/ui/explore/TrackListHelpers.cpp
@@ -74,7 +74,7 @@ namespace UserInterface::TrackListHelpers
 				Wt::WAnchor* anchor {entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false))};
 				auto cover {std::make_unique<Wt::WImage>()};
 				cover->setImageLink(LmsApp->getCoverResource()->getReleaseUrl(release->getId(), CoverResource::Size::Large));
-				cover->setStyleClass("Lms-cover");
+				cover->setStyleClass("img-fluid");
 				cover->setAttributeValue("onload", LmsApp->javaScriptClass() + ".onLoadCover(this)");
 				anchor->setImage(std::move(cover));
 			}
@@ -83,7 +83,7 @@ namespace UserInterface::TrackListHelpers
 		{
 			auto* cover {entry->bindNew<Wt::WImage>("cover")};
 			cover->setImageLink(LmsApp->getCoverResource()->getTrackUrl(trackId, CoverResource::Size::Large));
-			cover->setStyleClass("Lms-cover");
+			cover->setStyleClass("img-fluid");
 			cover->setAttributeValue("onload", LmsApp->javaScriptClass() + ".onLoadCover(this)");
 		}