diff --git a/browserid/compress.sh b/browserid/compress.sh
index 6872fe9fb50fcb37d9a78df5dd951f5f80003809..3d5f75eb2e10e1f2426f7d77503fb4928ad872dc 100755
--- a/browserid/compress.sh
+++ b/browserid/compress.sh
@@ -44,7 +44,7 @@ echo ''
 
 cd ../js
 # re-minimize everything together
-cat jquery-1.6.2.min.js json2.js browserid.js ../dialog/resources/underscore-min.js ../dialog/resources/storage.js ../dialog/resources/browserid-network.js ../dialog/resources/browserid-identities.js ../dialog/resources/tooltip.js ../dialog/resources/validation.js pages/index.js pages/add_email_address.js pages/verify_email_address.js pages/manage_account.js pages/signin.js pages/signup.js pages/forgot.js > lib.js
+cat jquery-1.6.2.min.js json2.js browserid.js ../dialog/resources/underscore-min.js ../dialog/resources/browserid-extensions.js ../dialog/resources/storage.js ../dialog/resources/browserid-network.js ../dialog/resources/browserid-identities.js ../dialog/resources/tooltip.js ../dialog/resources/validation.js pages/index.js pages/add_email_address.js pages/verify_email_address.js pages/manage_account.js pages/signin.js pages/signup.js pages/forgot.js > lib.js
 $UGLIFY < lib.js > lib.min.js
 
 cd ../css
diff --git a/browserid/static/css/style.css b/browserid/static/css/style.css
index 355babc78fd14c58ca0420cffab7b05189ac9736..7439d6cad4b4d20c94253cf4a82d9fd641616ec9 100644
--- a/browserid/static/css/style.css
+++ b/browserid/static/css/style.css
@@ -62,6 +62,7 @@ footer {
   position: absolute;
   top: 10px;
   left: 10px;
+  background: #000;
   background: rgba(0,0,0,.7);
   color: #fff;
   border-radius: 5px;
diff --git a/browserid/static/dialog/controllers/dialog_controller.js b/browserid/static/dialog/controllers/dialog_controller.js
index dc1b0923681c4f35a9fc769bcc014d2863c1eedd..488577cfb055a7e00242c17a45aaca647fb4a8fc 100644
--- a/browserid/static/dialog/controllers/dialog_controller.js
+++ b/browserid/static/dialog/controllers/dialog_controller.js
@@ -44,8 +44,6 @@
 
 PageController.extend("Dialog", {}, {
     init: function(el) {
-      var html = $.View("//dialog/views/body.ejs", {});
-      this.element.html(html);
       this.element.show();
 
       // keep track of where we are and what we do on success and error
diff --git a/browserid/static/dialog/css/popup.css b/browserid/static/dialog/css/popup.css
index fcd2eb0d195274dd8093d743dc27482030bd0721..3338041956d391c954369f89d1d3756513332489 100644
--- a/browserid/static/dialog/css/popup.css
+++ b/browserid/static/dialog/css/popup.css
@@ -489,6 +489,7 @@ html[xmlns] .cf {
   position: absolute;
   top: 10px;
   left: 10px;
+  background: #000;
   background: rgba(0,0,0,.7);
   color: #fff;
   border-radius: 5px;
diff --git a/browserid/static/dialog/dialog.js b/browserid/static/dialog/dialog.js
index 061ffa15f97389721b438a9908391395fa04ed7a..e0472fc73b652452e11f6beadb7bd5c27b52c72e 100644
--- a/browserid/static/dialog/dialog.js
+++ b/browserid/static/dialog/dialog.js
@@ -70,7 +70,6 @@ steal.plugins(
                'pickemail')					// loads files in controllers folder
 
 	.views('authenticate.ejs',
-           'body.ejs',
            'confirmemail.ejs',
            'pickemail.ejs',
            'wait.ejs'
diff --git a/browserid/static/dialog/views/body.ejs b/browserid/static/dialog/views/body.ejs
deleted file mode 100644
index 52e240068c805042271183cb1a2efd1f01ad4dea..0000000000000000000000000000000000000000
--- a/browserid/static/dialog/views/body.ejs
+++ /dev/null
@@ -1,43 +0,0 @@
-<div id="wrapper">
-  <header id="header" class="cf">
-      <ul>
-          <li><a class="home" target="_blank" href="/"></a></li>
-      </ul>
-  </header>
-
-  <div id="formWrap" class="cf">
-    <form novalidate> 
-      <div id="dialog" class="dialog cf">
-      </div>
-
-      <div id="error_dialog">
-        <h3 class="title"></h3>
-        <p class="content"></p>
-      </div>
-
-    </form>
-  </div>
-
-  <footer>
-        <ul class="cf">
-            <li>By <a href="http://mozillalabs.com">Mozilla Labs</a></li>
-
-            <li>&mdash;</li>           
-            <li><a href="#">Privacy</a></li>
-            <li><a href="#">TOS</a></li>
-        </ul>
-
-        <div class="learn">
-            BrowserID is the fast and secure way to sign in &mdash; <a target="_blank" href="/about">learn more</a>
-        </div>
-
-        <a class="help" href="http://support.mozilla.com/en-US/home" target="_blank">need help?</a>
-  </footer>
-
-</div>
-
-<script type="text/html" id="templateTooltip">
-  <div class="tooltip">
-    {{ contents }}
-  </div>
-</script>
diff --git a/browserid/views/dialog.ejs b/browserid/views/dialog.ejs
index 8f6827e02edfaad4fb48792263f8bc0fa1b55258..a8a693c196d6d610b8c03949faba7806acc99fef 100644
--- a/browserid/views/dialog.ejs
+++ b/browserid/views/dialog.ejs
@@ -4,13 +4,58 @@
   <meta charset="utf-8">
   <meta name="viewport" content="initial-scale=1.0; maximum-scale=1.0; width=device-width;">  
   <!--[if lt IE 9]>
-    <script src="/js/html5shim.js"></script>
+    <script type="text/javascript" src="/js/html5shim.js"></script>
   <![endif]-->
-  <link href='https://fonts.googleapis.com/css?family=Droid+Serif:400,400italic,700,700italic' rel='stylesheet' type='text/css'>
+  <link href="https://fonts.googleapis.com/css?family=Droid+Serif:400,400italic,700,700italic" rel="stylesheet" type="text/css">
   <title>Browser ID</title>
 </head>
   <body>
+      <div id="wrapper">
+          <header id="header" class="cf">
+              <ul>
+                  <li><a class="home" target="_blank" href="/"></a></li>
+              </ul>
+          </header>
+
+          <div id="formWrap" class="cf">
+            <form novalidate> 
+
+              <div id="dialog" class="dialog cf">
+
+              </div>
+
+              <div id="error_dialog">
+                  <h3 class="title"></h3>
+                  <p class="content"></p>
+              </div>
+
+            </form>
+          </div>
+
+          <footer>
+                <ul class="cf">
+                    <li>By <a href="http://mozillalabs.com">Mozilla Labs</a></li>
+
+                    <li>&mdash;</li>           
+                    <li><a href="#">Privacy</a></li>
+                    <li><a href="#">TOS</a></li>
+                </ul>
+
+                <div class="learn">
+                    BrowserID is the fast and secure way to sign in &mdash; <a target="_blank" href="/about">learn more</a>
+                </div>
+
+                <a class="help" href="http://support.mozilla.com/en-US/home" target="_blank">need help?</a>
+          </footer>
+
+      </div>
+
+      <script type="text/html" id="templateTooltip">
+        <div class="tooltip">
+          {{ contents }}
+        </div>
+      </script>
+      <script type="text/javascript" src="/vepbundle"></script>
+      <script type="text/javascript" src="steal/steal<%= production ? '.production' : '' %>.js?dialog"></script>
 	</body>
 </html>
-<script type='text/javascript' src='/vepbundle'></script>
-<script type='text/javascript' src='steal/steal<%= production ? ".production" : "" %>.js?dialog'></script>
diff --git a/browserid/views/layout.ejs b/browserid/views/layout.ejs
index 1aa89ac022eb3f4cba986dc6aa5c4bbf76b84b37..e173fcc52d2beda1382ebeb2a560a7de145f8e36 100644
--- a/browserid/views/layout.ejs
+++ b/browserid/views/layout.ejs
@@ -17,6 +17,7 @@
     <script src="/js/jquery-1.6.2.min.js" type="text/javascript"></script>
     <script src="/js/json2.js" type="text/javascript"></script>
     <script src="/dialog/resources/underscore-min.js" type="text/javascript"></script>
+    <script src="/dialog/resources/browserid-extensions.js" type="text/javascript"></script>
     <script src="/js/browserid.js" type="text/javascript"></script>
     <script src="/js/pages/index.js" type="text/javascript"></script>
     <script src="/dialog/resources/storage.js" type="text/javascript"></script>