diff --git a/approot/explore.xml b/approot/explore.xml
index 0151c03e..a73606e7 100644
--- a/approot/explore.xml
+++ b/approot/explore.xml
@@ -2,7 +2,7 @@
 <messages xmlns:if="Wt.WTemplate.conditions">
 
 <message id="Lms.Explore.template">
-	${contents class="Lms-explore-contents"}
+	${contents}
 </message>
 
 <message id="Lms.Explore.template.more-btn"><i class="fa fa-2x fa-plus-circle"></i></message>
diff --git a/approot/releases.xml b/approot/releases.xml
index 2cfd84b0..e2ea39ad 100644
--- a/approot/releases.xml
+++ b/approot/releases.xml
@@ -3,9 +3,9 @@
 <messages xmlns:if="Wt.WTemplate.conditions">
 
 <message id="Lms.Explore.Releases.template">
-	${mode class="nav nav-pills Lms-explore-mode-container mb-1"}
 	<div class="mb-3">
-		${play-btn}${more-btn}
+		${mode class="nav nav-pills mb-2"}
+		${play-btn class="me-2"}${more-btn}
 	</div>
 	${releases}
 </message>
diff --git a/approot/tracks.xml b/approot/tracks.xml
index c9d555be..7b1878c4 100644
--- a/approot/tracks.xml
+++ b/approot/tracks.xml
@@ -4,9 +4,9 @@
 <!--FORMS message blocks-->
 
 <message id="Lms.Explore.Tracks.template">
-	${mode class="nav nav-pills Lms-explore-mode-container mb-1"}
 	<div class="mb-3">
-		${play-btn}${more-btn}
+		${mode class="nav nav-pills mb-2"}
+		${play-btn class="me-2"}${more-btn}
 	</div>
 	${tracks}
 </message>
diff --git a/src/lms/ui/SettingsView.cpp b/src/lms/ui/SettingsView.cpp
index 7bbc5672..1e35234a 100644
--- a/src/lms/ui/SettingsView.cpp
+++ b/src/lms/ui/SettingsView.cpp
@@ -557,7 +557,7 @@ SettingsView::refreshView()
 	Wt::WPushButton *saveBtn {t->bindWidget("apply-btn", std::make_unique<Wt::WPushButton>(Wt::WString::tr("Lms.apply")))};
 	Wt::WPushButton *discardBtn {t->bindWidget("discard-btn", std::make_unique<Wt::WPushButton>(Wt::WString::tr("Lms.discard")))};
 
-	saveBtn->clicked().connect([=]()
+	saveBtn->clicked().connect([=]
 	{
 		{
 			auto transaction {LmsApp->getDbSession().createSharedTransaction()};
@@ -581,12 +581,12 @@ SettingsView::refreshView()
 		t->updateView(model.get());
 	});
 
-	discardBtn->clicked().connect(std::bind([=] ()
+	discardBtn->clicked().connect([=]
 	{
 		model->loadData();
 		model->validate();
 		t->updateView(model.get());
-	}));
+	});
 
 	t->updateView(model.get());
 }