diff --git a/src/khoj/interface/web/base_config.html b/src/khoj/interface/web/base_config.html
index 41347141..92e0ec27 100644
--- a/src/khoj/interface/web/base_config.html
+++ b/src/khoj/interface/web/base_config.html
@@ -12,24 +12,11 @@
     <body class="khoj-configure">
         <div class="khoj-header-wrapper">
             <div class="filler"></div>
-            <div class="khoj-header">
-                <a class="khoj-logo" href="https://khoj.dev" target="_blank">
-                    <img class="khoj-logo" src="/static/assets/icons/khoj-logo-sideways-500.png" alt="Khoj"></img>
-                </a>
-                <nav class="khoj-nav">
-                    <a class="khoj-nav" href="/chat">💬 Chat</a>
-                    <a class="khoj-nav" href="/">🔎 Search</a>
-                    <!-- Dropdown Menu -->
-                    <div id="khoj-nav-menu-container" class="khoj-nav dropdown">
-                        <img class="circle" src="{{ user_photo }}" alt="{{ username }}" onclick="toggleMenu()">
-                        <div id="khoj-nav-menu" class="khoj-nav-dropdown-content">
-                            <div class="khoj-nav-username"> {{ username }} </div>
-                            <a class="khoj-nav khoj-nav-selected" href="/config">⚙️ Settings</a>
-                            <a class="khoj-nav" href="/auth/logout">🔑 Logout</a>
-                        </div>
-                    </div>
-                </nav>
-            </div>
+
+            <!--Add Header Logo and Nav Pane-->
+            {% import 'utils.html' as utils %}
+            {{ utils.heading_pane(user_photo, username) }}
+
             <div class="filler"></div>
         </div>
         <div class=”content”>
diff --git a/src/khoj/interface/web/chat.html b/src/khoj/interface/web/chat.html
index a222569c..e4739cd2 100644
--- a/src/khoj/interface/web/chat.html
+++ b/src/khoj/interface/web/chat.html
@@ -270,32 +270,10 @@
                 <button id="khoj-banner-submit" class="khoj-banner-button">Submit</button>
         {% endif %}
         </div>
+
         <!--Add Header Logo and Nav Pane-->
-        <div class="khoj-header">
-            {% if demo %}
-                <a class="khoj-logo" href="https://khoj.dev" target="_blank">
-                    <img class="khoj-logo" src="/static/assets/icons/khoj-logo-sideways-500.png" alt="Khoj"></img>
-                </a>
-            {% else %}
-                <a class="khoj-logo" href="/">
-                    <img class="khoj-logo" src="/static/assets/icons/khoj-logo-sideways-500.png" alt="Khoj"></img>
-                </a>
-            {% endif %}
-            <nav class="khoj-nav">
-                <a class="khoj-nav khoj-nav-selected" href="/chat">💬 Chat</a>
-                <a class="khoj-nav" href="/">🔎 Search</a>
-                {% if not demo %}
-                    <!-- Dropdown Menu -->
-                    <div id="khoj-nav-menu-container" class="khoj-nav dropdown">
-                        <img class="circle" src="{{ user_photo }}" alt="{{ username }}" onclick="toggleMenu()">
-                        <div id="khoj-nav-menu" class="khoj-nav-dropdown-content">
-                            <div class="khoj-nav-username"> {{ username }} </div>
-                            <a class="khoj-nav khoj-nav-selected" href="/config">⚙️ Settings</a>
-                            <a class="khoj-nav" href="/auth/logout">🔑 Logout</a>
-                        </div>
-                {% endif %}
-            </nav>
-        </div>
+        {% import 'utils.html' as utils %}
+        {{ utils.heading_pane(user_photo, username) }}
 
         <!-- Chat Body -->
         <div id="chat-body"></div>
diff --git a/src/khoj/interface/web/index.html b/src/khoj/interface/web/index.html
index a3ed548f..8ea846e7 100644
--- a/src/khoj/interface/web/index.html
+++ b/src/khoj/interface/web/index.html
@@ -282,33 +282,10 @@
                 <button id="khoj-banner-submit" class="khoj-banner-button">Submit</button>
             </div>
         {% endif %}
+
         <!--Add Header Logo and Nav Pane-->
-        <div class="khoj-header">
-            {% if demo %}
-                <a class="khoj-logo" href="https://khoj.dev" target="_blank">
-                    <img class="khoj-logo" src="/static/assets/icons/khoj-logo-sideways-500.png" alt="Khoj"></img>
-                </a>
-            {% else %}
-                <a class="khoj-logo" href="/">
-                    <img class="khoj-logo" src="/static/assets/icons/khoj-logo-sideways-500.png" alt="Khoj"></img>
-                </a>
-            {% endif %}
-            <nav class="khoj-nav">
-                <a class="khoj-nav" href="/chat">💬 Chat</a>
-                <a class="khoj-nav khoj-nav-selected" href="/">🔎 Search</a>
-                {% if not demo %}
-                    <!-- Dropdown Menu -->
-                    <div id="khoj-nav-menu-container" class="khoj-nav dropdown">
-                        <img class="circle" src="{{ user_photo }}" alt="{{ username }}" onclick="toggleMenu()">
-                        <div id="khoj-nav-menu" class="khoj-nav-dropdown-content">
-                            <div class="khoj-nav-username"> {{ username }} </div>
-                            <a class="khoj-nav" href="/config">⚙️ Settings</a>
-                            <a class="khoj-nav" href="/auth/logout">🔑 Logout</a>
-                        </div>
-                    </div>
-                {% endif %}
-            </nav>
-        </div>
+        {% import 'utils.html' as utils %}
+        {{ utils.heading_pane(user_photo, username) }}
 
         <!--Add Text Box To Enter Query, Trigger Incremental Search OnChange -->
         <input type="text" id="query" class="option" onkeyup=incrementalSearch(event) autofocus="autofocus" placeholder="Search your knowledge base using natural language">
diff --git a/src/khoj/interface/web/utils.html b/src/khoj/interface/web/utils.html
new file mode 100644
index 00000000..31c07a54
--- /dev/null
+++ b/src/khoj/interface/web/utils.html
@@ -0,0 +1,20 @@
+{% macro heading_pane(user_photo="/static/assets/icons/anon.png", username="Anon") -%}
+    <div class="khoj-header">
+        <a class="khoj-logo" href="/" target="_blank">
+            <img class="khoj-logo" src="/static/assets/icons/khoj-logo-sideways-500.png" alt="Khoj"></img>
+        </a>
+        <nav class="khoj-nav">
+            <a class="khoj-nav" href="/chat">💬 Chat</a>
+            <a class="khoj-nav" href="/">🔎 Search</a>
+            <!-- Dropdown Menu -->
+            <div id="khoj-nav-menu-container" class="khoj-nav dropdown">
+                <img class="circle" src="{{ user_photo }}" alt="{{ username[0].upper() }}" onclick="toggleMenu()" referrerpolicy="no-referrer">
+                <div id="khoj-nav-menu" class="khoj-nav-dropdown-content">
+                    <div class="khoj-nav-username"> {{ username }} </div>
+                    <a class="khoj-nav khoj-nav-selected" href="/config">⚙️ Settings</a>
+                    <a class="khoj-nav" href="/auth/logout">🔑 Logout</a>
+                </div>
+            </div>
+        </nav>
+    </div>
+{%- endmacro %}
