diff --git a/src/styles/mash.css b/src/styles/mash.css
index 6d6e2a6b..4d5b7947 100644
--- a/src/styles/mash.css
+++ b/src/styles/mash.css
@@ -42,7 +42,7 @@ body {
   color: inherit;
 }
 
-solid-panes-header {
+solid-panes-header, #PageHeader {
   position: fixed;
   top: 0;
   left: 0;
@@ -1642,6 +1642,7 @@ label:focus-visible {
 /* Generated by AI */
 @media screen and (max-width: 768px) {
   solid-panes-header,
+  #PageHeader,
   #PageFooter {
     width: 100%;
   }
diff --git a/static/browse-test.html b/static/browse-test.html
index 4a9a06d2..3d1ab72f 100644
--- a/static/browse-test.html
+++ b/static/browse-test.html
@@ -18,9 +18,6 @@
   <script type="text/javascript" src="mashlib.js"></script>
 <script>
 document.addEventListener('DOMContentLoaded', function() {
-    const authn = SolidLogic.authn
-    const authSession = SolidLogic.authSession
-    const store = SolidLogic.store
     const dom = document
     // Disable cross-site proxy - modern Solid servers support CORS
     // $rdf.Fetcher.crossSiteProxyTemplate = self.origin + '/xss?uri={uri}'
@@ -37,14 +34,10 @@
 
       var subject = $rdf.sym(uri);
       outliner.GotoSubject(subject, true, undefined, true, undefined);
-      mungeLoginArea();
     }
 
     const uriField = dom.getElementById('uriField')
     const goButton = dom.getElementById('goButton')
-    const loginButtonArea = document.getElementById("loginButtonArea");
-    const webIdArea = dom.getElementById('webId')
-    const banner = dom.getElementById('PageHeader')
     const pageHeader = dom.getElementById('PageHeader')
 
     function updateHeaderOffset () {
@@ -55,7 +48,7 @@
 
     window.addEventListener('resize', updateHeaderOffset)
     updateHeaderOffset()
- 
+
     uriField.addEventListener('keyup', function (e) {
       if (e.keyCode === 13) {
         go(e)
@@ -68,82 +61,52 @@
       uriField.value = initial
       go()
     }
-    async function mungeLoginArea(){
-      loginButtonArea.innerHTML="";
-      if(uriField.value) {
-        loginButtonArea.appendChild(UI.login.loginStatusBox(document, null, {}))
-      }
-      const me = authn.currentUser()
-      if (me) {       
-        const logoutButton = loginButtonArea.querySelector('input');         
-        logoutButton.value = "Logout";           
-        let displayId = `&lt;${me.value}>`;
-        webIdArea.innerHTML = displayId;
-        banner.style.backgroundColor="#bbccbb";                                                                           
-      } else {                                                                  
-        banner.style.backgroundColor="#ccbbbb";                              
-      }                                                                
-      loginButtonArea.style.display="inline-block";                           
-      updateHeaderOffset()
-    }      
-
-    if (authSession) {
-      authSession.events.on("login", () => {
-        mungeLoginArea();
-        go()
-      })
-      authSession.events.on("logout", () => {
-        mungeLoginArea();
-        webIdArea.innerHTML = "public user";
-        go()
-      })
-      authSession.events.on("sessionRestore", (url) => {
-        mungeLoginArea();
-        go()
-      })
-    }
-    mungeLoginArea();
 });
 </script>
 </head>
 <body>
-  <header id="PageHeader" role="banner" class="header-mash">
-    SolidOS Databrowser
-    <div class="input-row" id="inputArea">
-        Viewing <input id="uriField" type="text" class="uri-field" placeholder="enter a pod address e.g. https://you.solidcommunity.net/"/> <input type="button" id="goButton" value="Go" />
+  <solid-ui-provider>
+    <header id="PageHeader" role="banner" class="header-mash">
+        SolidOS Databrowser
+        <div class="input-row" id="inputArea">
+            Viewing <input id="uriField" type="text" class="uri-field" placeholder="enter a pod address e.g. https://you.solidcommunity.net/"/> <input type="button" id="goButton" value="Go" />
+        </div>
+    </header>
+    <div class="user-row">
+        <solid-ui-account></solid-ui-account>
     </div>
-  </header>
-  <div class="user-row">
-    As user <span id="webId">&lt;public user></span> 
-    <span id="loginButtonArea"></span>
-  </div>
-  <main id="MainContent" tabindex="-1" aria-live="polite" class="browser-main">
+    <main id="MainContent" tabindex="-1" aria-live="polite" class="browser-main">
+        <table
+            id="OutlineView"
+            class="outline-view"
+            aria-label="Resource browser"
+            style="width: 100%"
+        >
+        </table>
 
-    <table
-          id="OutlineView"
-          class="outline-view"
-          aria-label="Resource browser"
-          style="width: 100%"
-    >
-    </table>
+        <section
+            id="GlobalDashboard"
+            class="global-dashboard"
+            aria-label="Dashboard"
+            hidden
+        >
+        </section>
 
-    <section
-        id="GlobalDashboard"
-        class="global-dashboard"
-        aria-label="Dashboard"
-        hidden
-    >
-    </section>
+    </main>
 
-  </main>
+    <footer id="PageFooter" role="contentinfo"></footer>
+  </solid-ui-provider>
 
-  <footer id="PageFooter" role="contentinfo"></footer>
   <style>
+    body {
+      padding-top: calc(var(--browse-header-offset, var(--app-header-height, 3.8rem)) + 0.35rem);
+    }
+    .outline-view {
+      width: 100%;
+    }
     .header-mash {
       padding:1em !important;
     }
-    .input-row {
-    }
     .browser-main {
       margin-top: 0 !important;
     }
@@ -153,16 +116,6 @@
       padding-bottom: 0.5em;
       margin-left:1em;
     }
-    #loginButtonArea input {
-      display:inline-block;
-      margin:0.25em !important;
-      padding:0.25em !important;
-    }
-    #webId {
-      display:inline-block;
-      padding-top:0.6em;
-      padding-bottom:0.6em;
-    }
     #uriField, .uri-field {
       font-size:100%;
       min-width:25em;
@@ -170,21 +123,6 @@
       width:70%;
       margin-top:0.6em !important;
     }
-
-    /* Local fix: make full-screen idp popup overlay appear above all fixed page elements */
-    div[style*="position: fixed"][style*="justify-content: center"][style*="align-items: center"],
-    div[style*="min-width: 400px"][style*="box-shadow"],
-    div[style*="z-index : 10"],
-    div[style*="z-index: 10"] {
-      z-index: 2147483647 !important;
-      top: 0 !important;
-      left: 0 !important;
-      right: 0 !important;
-      bottom: 0 !important;
-      justify-content: center !important;
-      align-items: center !important;
-    }
-
   </style>
 
 </body>
diff --git a/static/browse.html b/static/browse.html
index bf62dee1..3d1ab72f 100644
--- a/static/browse.html
+++ b/static/browse.html
@@ -18,9 +18,6 @@
   <script type="text/javascript" src="mashlib.js"></script>
 <script>
 document.addEventListener('DOMContentLoaded', function() {
-    const authn = SolidLogic.authn
-    const authSession = SolidLogic.authSession
-    const store = SolidLogic.store
     const dom = document
     // Disable cross-site proxy - modern Solid servers support CORS
     // $rdf.Fetcher.crossSiteProxyTemplate = self.origin + '/xss?uri={uri}'
@@ -37,15 +34,11 @@
 
       var subject = $rdf.sym(uri);
       outliner.GotoSubject(subject, true, undefined, true, undefined);
-      mungeLoginArea();
     }
 
     const uriField = dom.getElementById('uriField')
     const goButton = dom.getElementById('goButton')
-    const loginButtonArea = document.getElementById("loginButtonArea");
-    const webIdArea = dom.getElementById('webId')
-    const banner = dom.getElementById('PageHeader')
-    const pageHeader = dom.querySelector('solid-panes-header')
+    const pageHeader = dom.getElementById('PageHeader')
 
     function updateHeaderOffset () {
       if (!pageHeader) return
@@ -68,41 +61,6 @@
       uriField.value = initial
       go()
     }
-    async function mungeLoginArea(){
-      loginButtonArea.innerHTML="";
-      if(uriField.value) {
-        loginButtonArea.appendChild(UI.login.loginStatusBox(document, null, {}))
-      }
-      const me = authn.currentUser()
-      if (me) {
-        const logoutButton = loginButtonArea.querySelector('input');
-        logoutButton.value = "Logout";
-        let displayId = `&lt;${me.value}>`;
-        webIdArea.innerHTML = displayId;
-        banner.style.backgroundColor="#bbccbb";
-      } else {
-        banner.style.backgroundColor="#ccbbbb";
-      }
-      loginButtonArea.style.display="inline-block";
-      updateHeaderOffset()
-    }
-
-    if (authSession) {
-      authSession.events.on("login", () => {
-        mungeLoginArea();
-        go()
-      })
-      authSession.events.on("logout", () => {
-        mungeLoginArea();
-        webIdArea.innerHTML = "public user";
-        go()
-      })
-      authSession.events.on("sessionRestore", (url) => {
-        mungeLoginArea();
-        go()
-      })
-    }
-    mungeLoginArea();
 });
 </script>
 </head>
@@ -115,11 +73,9 @@
         </div>
     </header>
     <div class="user-row">
-        As user <span id="webId">&lt;public user></span>
-        <span id="loginButtonArea"></span>
+        <solid-ui-account></solid-ui-account>
     </div>
     <main id="MainContent" tabindex="-1" aria-live="polite" class="browser-main">
-
         <table
             id="OutlineView"
             class="outline-view"
@@ -142,14 +98,15 @@
   </solid-ui-provider>
 
   <style>
+    body {
+      padding-top: calc(var(--browse-header-offset, var(--app-header-height, 3.8rem)) + 0.35rem);
+    }
     .outline-view {
       width: 100%;
     }
     .header-mash {
       padding:1em !important;
     }
-    .input-row {
-    }
     .browser-main {
       margin-top: 0 !important;
     }
@@ -159,16 +116,6 @@
       padding-bottom: 0.5em;
       margin-left:1em;
     }
-    #loginButtonArea input {
-      display:inline-block;
-      margin:0.25em !important;
-      padding:0.25em !important;
-    }
-    #webId {
-      display:inline-block;
-      padding-top:0.6em;
-      padding-bottom:0.6em;
-    }
     #uriField, .uri-field {
       font-size:100%;
       min-width:25em;
@@ -176,21 +123,6 @@
       width:70%;
       margin-top:0.6em !important;
     }
-
-    /* Local fix: make full-screen idp popup overlay appear above all fixed page elements */
-    div[style*="position: fixed"][style*="justify-content: center"][style*="align-items: center"],
-    div[style*="min-width: 400px"][style*="box-shadow"],
-    div[style*="z-index : 10"],
-    div[style*="z-index: 10"] {
-      z-index: 2147483647 !important;
-      top: 0 !important;
-      left: 0 !important;
-      right: 0 !important;
-      bottom: 0 !important;
-      justify-content: center !important;
-      align-items: center !important;
-    }
-
   </style>
 
 </body>
