diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/base.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/base.html.j2
index 33890e8..a5e92c7 100644
--- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/base.html.j2
+++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/base.html.j2
@@ -11,10 +11,6 @@
   </head>
   <body class="bg-gray-50 text-gray-900 min-h-screen flex flex-col">
 
-    <!-- Optional: Shoelace modals, toasts -->
-    <sl-alert id="global-alert" variant="primary" duration="4000" closable></sl-alert>
-    <sl-dialog id="global-dialog" label="Dialog"></sl-dialog>
-
     <!-- Layout Container -->
     <div class="flex flex-1 h-full overflow-hidden">
 
diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/navbar.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/navbar.html.j2
index 2ca5952..a67d075 100644
--- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/navbar.html.j2
+++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/navbar.html.j2
@@ -15,18 +15,9 @@
     </button>
 
     <!-- Page title or logo -->
-         <a href="/" class="flex ml-2 md:mr-24">
-          <img
-            src="{{ url_for('static', path='logo.svg') }}"
-            class="h-11 mr-3"
-            alt="Sshecret Logo"
-          />
-          <span
-            class="self-center text-xl font-semibold sm:text-2xl whitespace-nowrap dark:text-white"
-            >Sshecret</span
-          >
-        </a>
-
+    {% if page_title %}
+      <h1 class="text-xl flex ml-2 md:mr-24 font-semibold text-gray-900 sm:text-2xl dark:text-white">{{page_title}}</h1>
+    {% endif %}
   </div>
 
   <!-- Right: User menu -->
diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/sidebar.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/sidebar.html.j2
index d34a839..6be8f78 100644
--- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/sidebar.html.j2
+++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/sidebar.html.j2
@@ -4,7 +4,8 @@
 <div class="px-4 py-6">
 
   <a href="/" class="text-xl font-semibold text-gray-800">
-    🐚 Sshecret
+    <sl-icon src="{{ url_for('static', path='logo.svg') }}"></sl-icon>
+    Sshecret
   </a>
 </div>
 
diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/tree.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/tree.html.j2
index 5f97a2f..c983c43 100644
--- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/tree.html.j2
+++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/tree.html.j2
@@ -2,8 +2,6 @@
 
 <div class="flowbite-init-target">
   <div class="tree-header grid grid-cols-2 place-content-between mb-6">
-    <h1 class="text-xl font-semibold text-gray-900 sm:text-2xl dark:text-white">Clients</h1>
-
     <div class="flex">
       <div
         class="htmx-indicator mt-2"
diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/login.html b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/login.html
index 10143f0..9ff154f 100644
--- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/login.html
+++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/login.html
@@ -1,4 +1,4 @@
-{% extends "/shared/_base.html" %} {% block content %} {% if login_error %}
+{% extends "/base/bare.html.j2" %} {% block content %} {% if login_error %}
 
 <div class="flex bg-gray-100">
   <div
@@ -88,7 +88,5 @@
       </a>
     </div>
   </div>
-  {% endif %}
-
-  {% endblock %}
+  {% endif %} {% endblock %}
 </div>
diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/secrets/index.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/secrets/index.html.j2
index 2fba46c..3c4494a 100644
--- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/secrets/index.html.j2
+++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/secrets/index.html.j2
@@ -55,9 +55,6 @@
 {% block master %}
 
 <div class="flowbite-init-target">
-  <div class="tree-header grid grid-cols-2 place-content-between mb-6">
-    <h1 class="text-xl font-semibold text-gray-900 sm:text-2xl dark:text-white">Secrets</h1>
-  </div>
   <div id="secret-tree">
     <sl-tree class="tree-with-icons">
       <sl-tree-item
diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/views/audit.py b/packages/sshecret-admin/src/sshecret_admin/frontend/views/audit.py
index 9462448..bbe2853 100644
--- a/packages/sshecret-admin/src/sshecret_admin/frontend/views/audit.py
+++ b/packages/sshecret-admin/src/sshecret_admin/frontend/views/audit.py
@@ -57,6 +57,7 @@ def create_router(dependencies: FrontendDependencies) -> APIRouter:
             request,
             "audit/index.html.j2",
             {
+                "page_title": "Audit Log",
                 "breadcrumbs": breadcrumbs,
                 "entries": audit_log.results,
                 "user": current_user,
diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/views/index.py b/packages/sshecret-admin/src/sshecret_admin/frontend/views/index.py
index edec64c..e9c2c68 100644
--- a/packages/sshecret-admin/src/sshecret_admin/frontend/views/index.py
+++ b/packages/sshecret-admin/src/sshecret_admin/frontend/views/index.py
@@ -81,7 +81,7 @@ def create_router(dependencies: FrontendDependencies) -> APIRouter:
             request,
             "dashboard.html",
             {
-                "page_title": "sshecret",
+                "page_title": "Dashboard",
                 "user": current_user,
                 "stats": stats,
                 "last_login_events": last_login_events,
diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/views/secrets.py b/packages/sshecret-admin/src/sshecret_admin/frontend/views/secrets.py
index af924ab..1300ac2 100644
--- a/packages/sshecret-admin/src/sshecret_admin/frontend/views/secrets.py
+++ b/packages/sshecret-admin/src/sshecret_admin/frontend/views/secrets.py
@@ -69,6 +69,7 @@ def create_router(dependencies: FrontendDependencies) -> APIRouter:
             request,
             "secrets/index.html.j2",
             {
+                "page_title": "Secrets",
                 "groups": groups,
                 "breadcrumbs": breadcrumbs,
                 "user": current_user,
@@ -104,6 +105,7 @@ def create_router(dependencies: FrontendDependencies) -> APIRouter:
         else:
             groups = await admin.get_secret_groups()
             template_name = "secrets/index.html.j2"
+            context["page_title"] = "Secrets"
             context["user"] = current_user
             context["groups"] = groups
             context["group_path_nodes"] = ["/"]
@@ -151,6 +153,7 @@ def create_router(dependencies: FrontendDependencies) -> APIRouter:
             template_name = "secrets/index.html.j2"
 
             groups = await admin.get_secret_groups()
+            context["page_title"] = "Secrets"
             context["user"] = current_user
             context["groups"] = groups
             context["group_path_nodes"] = group.path.split("/")
@@ -198,6 +201,7 @@ def create_router(dependencies: FrontendDependencies) -> APIRouter:
                     group_path = group.path.split("/")
 
             template_name = "secrets/index.html.j2"
+            context["page_title"] = "Secrets"
             context["user"] = current_user
             context["groups"] = groups
             context["group_path_nodes"] = group_path
