diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/audit/index.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/audit/index.html.j2
index 7822b27..f86742d 100644
--- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/audit/index.html.j2
+++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/audit/index.html.j2
@@ -1,60 +1,6 @@
-{% extends "/dashboard/_base.html" %} {% block content %}
-<div
-  class="p-4 bg-white block sm:flex items-center justify-between border-b border-gray-200 lg:mt-1.5 dark:bg-gray-800 dark:border-gray-700"
-  >
-  <div class="w-full mb-1">
-    <div class="mb-4">
-      <nav class="flex mb-5" aria-label="Breadcrumb">
-        <ol
-          class="inline-flex items-center space-x-1 text-sm font-medium md:space-x-2"
-          >
-          <li class="inline-flex items-center">
-            <a
-              href="/"
-              class="inline-flex items-center text-gray-700 hover:text-primary-600 dark:text-gray-300 dark:hover:text-white"
-              >
-              <svg
-                class="w-5 h-5 mr-2.5"
-                fill="currentColor"
-                viewBox="0 0 20 20"
-                xmlns="http://www.w3.org/2000/svg"
-                >
-                <path
-                  d="M10.707 2.293a1 1 0 00-1.414 0l-7 7a1 1 0 001.414 1.414L4 10.414V17a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 001 1h2a1 1 0 001-1v-6.586l.293.293a1 1 0 001.414-1.414l-7-7z"
-                  ></path>
-              </svg>
-              Home
-            </a>
-          </li>
-          <li>
-            <div class="flex items-center">
-              <svg
-                class="w-6 h-6 text-gray-800 dark:text-white"
-                aria-hidden="true"
-                xmlns="http://www.w3.org/2000/svg"
-                width="24"
-                height="24"
-                fill="none"
-                viewBox="0 0 24 24"
-                >
-                <path
-                  stroke="currentColor"
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                  stroke-width="2"
-                  d="M9 8h6m-6 4h6m-6 4h6M6 3v18l2-2 2 2 2-2 2 2 2-2 2 2V3l-2 2-2-2-2 2-2-2-2 2-2-2Z"
-                  />
-
-                  <span class="ml-1 text-gray-400 md:ml-2 dark:text-gray-500" aria-current="page">Audit Log</span>
-              </svg>
-            </div>
-          </li>
-        </ol>
-      </nav>
-      <h1 class="text-xl font-semibold text-gray-900 sm:text-2xl dark:text-white">Audit Log</h1>
-    </div>
-  </div>
-</div>
+{% extends "/base/page.html.j2" %}
+{% block title %}Audit{% endblock %}
+{% block page_content %}
 <div id="auditContent">
 {% include 'audit/inner.html.j2' %}
 </div>
diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/change_password/index.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/change_password/index.html.j2
index 2f10a8e..e826bcd 100644
--- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/change_password/index.html.j2
+++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/change_password/index.html.j2
@@ -1,5 +1,9 @@
-{% extends "/dashboard/_base.html" %} {% block content %}
-<div class="min-h-screen bg-gray-100 flex items-center justify-center p-4">
+{% extends "/base/page.html.j2" %}
+{% block title %}Change Password{% endblock %}
+
+{% block page_content %}
+
+<div class="h-[calc(100vh-8rem)] bg-gray-100 flex items-center justify-center p-4">
   <div class="w-full max-w-xl p-6 space-y-8 bg-white rounded-lg shadow sm:p-8 dark:bg-gray-800">
     <h2 class="text-2xl font-bold text-gray-900 dark:text-white">
       Change Password
diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/change_password/success.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/change_password/success.html.j2
index 748faec..dd7b081 100644
--- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/change_password/success.html.j2
+++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/change_password/success.html.j2
@@ -1,5 +1,8 @@
-{% extends "/dashboard/_base.html" %} {% block content %}
-<div class="min-h-screen bg-gray-100 flex items-center justify-center p-4">
+
+{% extends "/base/page.html.j2" %}
+
+ {% block page_content %}
+<div class="h-[calc(100vh-8rem)] bg-gray-100 flex items-center justify-center p-4">
   <div class="text-center xl:max-w-4xl">
     <h1 class="mb-3 text-2xl font-bold leading-tight text-gray-900 sm:text-4xl lg:text-5xl dark:text-white">Password Changed</h1>
     <p class="mb-5 text-base font-normal text-gray-500 md:text-lg dark:text-gray-400">Your password was changed sucessfully. Next time you log in, use your new password.</p>
@@ -9,4 +12,4 @@
     </a>
   </div>
 </div>
-{% endblock content %}
+{% endblock %}
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 9c042d3..9462448 100644
--- a/packages/sshecret-admin/src/sshecret_admin/frontend/views/audit.py
+++ b/packages/sshecret-admin/src/sshecret_admin/frontend/views/audit.py
@@ -42,6 +42,7 @@ def create_router(dependencies: FrontendDependencies) -> APIRouter:
             page=page, limit=per_page, total=audit_log.total, offset=offset
         )
         operations = list(Operation)
+        breadcrumbs = [("Audit", "/audit/")]
         if request.headers.get("HX-Request"):
             return templates.TemplateResponse(
                 request,
@@ -56,7 +57,7 @@ def create_router(dependencies: FrontendDependencies) -> APIRouter:
             request,
             "audit/index.html.j2",
             {
-                "page_title": "Audit",
+                "breadcrumbs": breadcrumbs,
                 "entries": audit_log.results,
                 "user": current_user,
                 "page_info": page_info,