diff --git a/approot/main.xml b/approot/main.xml
index 016484e5..71c46fca 100644
--- a/approot/main.xml
+++ b/approot/main.xml
@@ -14,9 +14,9 @@
 <message id="Lms.main.template.navbar">
 	<nav class="navbar navbar-expand-md navbar-dark bg-dark mb-3">
 		<div class="container">
-			<form class="d-flex">
+			<div class="d-flex">
 				${search class="form-control" type="search"}
-			</form>
+			</div>
 		    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
 				<span class="navbar-toggler-icon"></span>
 			</button>
diff --git a/src/lms/ui/LmsApplication.cpp b/src/lms/ui/LmsApplication.cpp
index e05aa14c..2add3a16 100644
--- a/src/lms/ui/LmsApplication.cpp
+++ b/src/lms/ui/LmsApplication.cpp
@@ -44,6 +44,7 @@
 #include "admin/DatabaseSettingsView.hpp"
 #include "admin/UserView.hpp"
 #include "admin/UsersView.hpp"
+#include "common/Template.hpp"
 #include "explore/Explore.hpp"
 #include "explore/Filters.hpp"
 #include "resource/AudioFileResource.hpp"
@@ -418,7 +419,7 @@ LmsApplication::createHome()
 
 	main->addFunction("tr", &Wt::WTemplate::Functions::tr);
 
-	Wt::WTemplate* navbar {main->bindNew<Wt::WTemplate>("navbar", Wt::WString::tr("Lms.main.template.navbar"))};
+	Template* navbar {main->bindNew<Template>("navbar", Wt::WString::tr("Lms.main.template.navbar"))};
 	navbar->addFunction("tr", &Wt::WTemplate::Functions::tr);
 
 	_notificationContainer = main->bindNew<NotificationContainer>("notifications");