diff --git a/default-templates/server/index.html b/default-templates/server/index.html
index 37df7b336..00a466c04 100644
--- a/default-templates/server/index.html
+++ b/default-templates/server/index.html
@@ -4,19 +4,45 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Welcome to Solid</title>
-  <link rel="stylesheet" href="/common/css/bootstrap.min.css">
-  <link rel="stylesheet" href="/common/css/solid.css">
-</head>
-<body>
-<div class="container">
-  <div class="page-header">
-    <div class="pull-right">
-      <button id="register" type="button" class="btn btn-primary">Register</button>
-      <button id="login"    type="button" class="hidden btn btn-default btn-success">Log in</button>
-      <button id="logout"   type="button" class="hidden btn btn-danger">Log out</button>
-    </div>
+  <style>
+  #prototype {
+    margin : 2em;
+    padding : 1em;
+  }
+  #prototype input {
+    margin : 1em;
+    padding : 0.5em !important;
+  }
+  #loginStatusArea {
+    float:right;
+    clear:right;
+    margin-top:-5em;
+  }
+  </style>
+  <script>
+    document.addEventListener('DOMContentLoaded', async function() {
+      if (!UI.authn.currentUser()) await UI.authn.checkUser();
+      let user = UI.authn.currentUser();
+      if( user ) {
+        document.getElementById('prototype').style.display = "none";
+        var podRoot = user.uri.replace(/profile.*$/,'');
+        podRoot = UI.rdf.sym(podRoot)
+        panes.runDataBrowser(podRoot);
+      }
+      else {
+        document.getElementById('prototype').style.display = "block";
+        document.getElementById('loginStatusArea').appendChild(UI.authn.loginStatusBox(document, null, {}))
+
+      }     
+    })
+  </script>
+  <link href="/mash.css" rel="stylesheet"> 
+</head><body class="db-layout">
 
+<div id="prototype" class="container">
+  <div class="page-header">
     <h1>Welcome to the Solid Prototype</h1>
+    <div id="loginStatusArea" class="pull-right"></div>
   </div>
 
   <p class="lead">
@@ -27,11 +53,6 @@ <h1>Welcome to the Solid Prototype</h1>
     If you have not already done so, please create an account.
   </p>
 
-  <p class="lead hidden" id="loggedIn">
-    You are logged in as
-    <a href="#" id="profileLink"></a>.
-  </p>
-
   <section>
     {{#if serverLogo}}
     <img src="{{serverLogo}}" />
@@ -49,7 +70,15 @@ <h2>Server info</h2>
     </dl>
   </section>
 </div>
-<script src="/common/js/solid-auth-client.bundle.js"></script>
-<script src="/common/js/auth-buttons.js"></script>
+
+<header class="db-layout__header header" id="PageHeader"></header>
+<div class="TabulatorOutline db-layout__content" id="DummyUUID" role="main">
+  <table id="outline"></table>
+  <div id="GlobalDashboard"></div>
+</div>
+<footer class="db-layout__footer" id="PageFooter"></footer>
+
+<script src="/mashlib.js"></script>
+
 </body>
 </html>
