diff --git a/authority/static/css/style.css b/authority/static/css/style.css
index eaddc5820305219dcb77029d5bd87f6827a97f28..589531c73758f91974100cf41f9fc9ce78660828 100644
--- a/authority/static/css/style.css
+++ b/authority/static/css/style.css
@@ -186,5 +186,43 @@ pre code {
     -webkit-border-radius: 10px;
     -moz-border-radius: 10px;
     border-radius: 10px 10px 10px 10px;
+}
 
+#emailList {
+  font-size: 1.0em; 
+  width: 4x00px; 
+  margin: auto; 
+  font-weight:bold;
+  margin-top:32px;
+}
+.email {
+  display:inline-block;
+}
+.emailblock a {
+  font-size:0.7em;
+  color:#405090;
+}
+.emailblock {
+  border: 1px solid #ddd;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  background-color:#f0f0f0;
+  width:500px;
+  padding:8px;
+  min-height:48px;
+  margin:16px auto;
+}
+.meta {
+  display:inline-block;
+  float:right;
+  font:8pt Arial;  
+}
+.meta a {
+  cursor:pointer;
+}
+.keyblock {
+  font:8pt Arial;
+}
+.date {
+  font:8pt Arial;
 }
diff --git a/authority/static/manage.html b/authority/static/manage.html
index 22bb05542be1d47904cebb20a8ecd923dab85f99..2d8db172cbc8414c678354b21facab57331867f5 100644
--- a/authority/static/manage.html
+++ b/authority/static/manage.html
@@ -1,77 +1,41 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>
-BrowserID Control
-</title>
-<script src="../dialog/jquery-min.js"></script>
-<link href="http://fonts.googleapis.com/css?family=Permanent+Marker" rel="stylesheet" type="text/css">
-<style type="text/css">
-
-body { margin: auto; font: 13px/1.5 Helvetica, Arial, 'Liberation Sans', FreeSans, sans-serif; }
-a:link, a:visited { font-style: italic; text-decoration: none; color: #008; }
-a:hover { border-bottom: 2px solid black ; }
-.number { font-family: 'Permanent Marker', arial, serif; font-size: 4em; float: left; padding: 0; margin: 0; vertical-align: top; width: 1.3em}
-.title { font-size: 2em; font-weight: bold; text-align: center; margin: 1.5em; }
-.intro { font-size: 1.2em; width: 600px; margin: auto; }
-.step { width: 600px; margin: auto; margin-top: 1em;}
-.desc { padding-top: 1.5em; min-height: 4.5em;}
-.output {
-  font-family: 'lucida console', monaco, 'andale mono', 'bitstream vera sans mono', consolas, monospace;
-  border: 3px solid #666;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
-  padding: .5em;
-  margin: .5em;
-  color: #ccc;
-  background-color: #333;
-/*  white-space: pre;*/
-  font-size: .9em;
-  width:600px;
-  word-wrap: break-word;
-}
-#emailList {
-  font-size: 1.0em; 
-  width: 4x00px; 
-  margin: auto; 
-  font-weight:bold;
-  margin-top:32px;
-}
-.email {
-  display:inline-block;
-}
-.emailblock a {
-  font-size:0.7em;
-  color:#405090;
-}
-.emailblock {
-  border: 1px solid #ddd;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  background-color:#f0f0f0;
-  width:500px;
-  padding:8px;
-  min-height:48px;
-  margin:16px auto;
-}
-.meta {
-  display:inline-block;
-  float:right;
-  font:8pt Arial;  
-}
-.meta a {
-  cursor:pointer;
-}
-.keyblock {
-  font:8pt Arial;
-}
-.date {
-  font:8pt Arial;
-}
-</style>
-<body>
-
+  <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+  <title>BrowserID - My Account</title>
+  <link rel="stylesheet" href="css/style.css"  type="text/css">
+</head>
+<body onload="display_saved_ids()">
+<div id="splash">
+  <div class="topquarter">
+    <div>
+      <a href="/"><div class="title">BrowserID</div></a>
+      <div class="subtitle">My Account</div>
+    </div>
+  </div>
+  <div class="bottomhalf">
+    <div class="why">
+      <p>
+        Manage your email addresses in BrowserID.
+      </p>
+    </div>
+    <div id="emailList">
+    </div>
+  </div>
+  <div class="footer">
+    <div>
+      <div class="right">
+        <p><b>BrowserID</b> is an <b>open source experiment</b> into improving identity and authentication on the web, by
+          <a href="https://mozillalabs.com">mozilla labs</a>.</p>
+      </div>
+      <div class="left">
+        <p> <a href="https://github.com/mozilla/browserid">Source Code</a>&nbsp;&nbsp;&nbsp;<a href="https://wiki.mozilla.org/Identity/Verified_Email_Protocol">Specification</a>&nbsp;&nbsp;&nbsp;<a href="http://groups.google.com/group/mozilla-labs">Mailing list</a> </p>
+        <p class="copyright">Copyright © 2011 Mozilla.  All rights reserved. </p>
+      </div>
+    </div>
+  </div>
+</div>
+</body>
 <script>
 function display_saved_ids()
 {
@@ -91,8 +55,6 @@ function display_saved_ids()
 
       var data = emails[e];
       
-
-
       var priv = $("<div class='keyblock'>").text(data.priv);
       var pub = $("<div class='keyblock'>").text(data.pub);
       priv.hide();
@@ -131,18 +93,5 @@ function display_saved_ids()
   }
 }
 </script>
-<body onload="display_saved_ids()">
-
-<div class="title">
-BrowserID Control
-</div>
-
-<div class="intro">
-  This page manages your BrowserID status: it displays which identities
-  you have confirmed in this browser.
-</div>
-
-<div id="emailList">
-<div>
 
-</body>
\ No newline at end of file
+</html>