diff --git a/app/templates/base.html b/app/templates/base.html
index c0e31db..a24f29d 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -202,16 +202,16 @@
     <header class="topbar">
       <div class="topbar-left">
         <div class="topbar-breadcrumb">
-          <span>{{ workspaceName }}</span>
+          <span x-text="workspaceName"></span>
           <span class="text-dim">/</span>
-          <span class="text-dim">{{ currentPage }}</span>
+          <span class="text-dim" x-text="currentPage"></span>
         </div>
       </div>
 
       <div class="topbar-center">
         <div class="topbar-page-title">
-          <span class="page-icon">{{ pageIcon }}</span>
-          <span>{{ pageTitle }}</span>
+          <span class="page-icon" x-text="pageIcon"></span>
+          <span x-text="pageTitle"></span>
         </div>
         <div class="topbar-page-status">
           <span>🔒</span> Private
@@ -220,7 +220,7 @@
       </div>
 
       <div class="topbar-right">
-        <span class="text-xs text-dim">Edited {{ lastEdited }}</span>
+        <span class="text-xs text-dim">Edited <span x-text="lastEdited"></span></span>
         <button class="topbar-btn">🔔</button>
         <button class="topbar-btn">🕒</button>
         <button class="topbar-btn">🔍</button>
@@ -292,10 +292,10 @@
     </div>
     <div class="context-menu-section">
       <div class="context-menu-item text-dim" style="font-size:11px; cursor:default;">
-        Last edited by {{ workspaceName }}
+        Last edited by <span x-text="workspaceName"></span>
       </div>
       <div class="context-menu-item text-dim" style="font-size:11px; cursor:default;">
-        {{ lastEdited }}
+        <span x-text="lastEdited"></span>
       </div>
       <div class="context-menu-item" @click="contextAction('learnDb')">
         <span class="menu-icon">❓</span> Learn about databases