diff --git a/pkg/servers/ui/views/layouts/base.jet b/pkg/servers/ui/views/layouts/base.jet
index 62e5f2e..6a14a5f 100644
--- a/pkg/servers/ui/views/layouts/base.jet
+++ b/pkg/servers/ui/views/layouts/base.jet
@@ -10,15 +10,13 @@
     <link rel="stylesheet" href="/static/css/custom.css">
 </head>
 <body>
-    {{ import "../components/navbar.jet" }}
-    {{ yield navbar() }}
+    {{ include "../components/navbar" }}
 
     <div class="container-fluid">
         <div class="row">
             <nav id="sidebarMenu" class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse">
                 <div class="position-sticky pt-3">
-                    {{ import "../components/sidebar.jet" }}
-                    {{ yield sidebar() }}
+                    {{ include "../components/sidebar" }}
                 </div>
             </nav>
 
diff --git a/pkg/servers/ui/views/pages/dashboard.jet b/pkg/servers/ui/views/pages/dashboard.jet
index 238b58e..4169d1b 100644
--- a/pkg/servers/ui/views/pages/dashboard.jet
+++ b/pkg/servers/ui/views/pages/dashboard.jet
@@ -1,4 +1,4 @@
-{{ extends "../layouts/base.jet" }}
+{{ extends "../layouts/base" }}
 
 {{ block title() }}Dashboard - HeroApp UI{{ end }}
 
diff --git a/pkg/servers/ui/views/pages/login.jet b/pkg/servers/ui/views/pages/login.jet
index 1032d7a..1e1aa90 100644
--- a/pkg/servers/ui/views/pages/login.jet
+++ b/pkg/servers/ui/views/pages/login.jet
@@ -1,4 +1,4 @@
-{{ extends "../layouts/base.jet" }}
+{{ extends "../layouts/base" }}
 
 {{ block title() }}Login - HeroApp UI{{ end }}
 
diff --git a/pkg/servers/ui/views/pages/process_manager.jet b/pkg/servers/ui/views/pages/process_manager.jet
index 9fc8d67..6cb2516 100644
--- a/pkg/servers/ui/views/pages/process_manager.jet
+++ b/pkg/servers/ui/views/pages/process_manager.jet
@@ -1,4 +1,4 @@
-{{ extends "../layouts/base.jet" }}
+{{ extends "../layouts/base" }}
 
 {{ block title() }}Process Manager - HeroApp UI{{ end }}
 
