diff --git a/resources/static/js/browserid.js b/resources/static/js/browserid.js
index 217e7cd03418c7e26472497a271594b33589b11f..0e698186572e127be8725629db0067c3c0dcfa1d 100644
--- a/resources/static/js/browserid.js
+++ b/resources/static/js/browserid.js
@@ -78,24 +78,20 @@ $(function() {
     });
   });
 
-  $("#vAlign,#content").hide();
+  $(".display_always,.display_auth,.display_nonauth").hide();
 
   var ANIMATION_TIME = 500;
   user.checkAuthentication(function(authenticated) {
+    $(".display_always").fadeIn(ANIMATION_TIME);
+
     if (authenticated) {
-      $("#content").fadeIn(ANIMATION_TIME);
+      $(".display_auth").fadeIn(ANIMATION_TIME);
       if ($('#emailList').length) {
         bid.manageAccount();
       }
     }
     else {
-      // If vAlign exists (main page), it takes precedence over content.
-      if( $("#vAlign").length) {
-        $("#vAlign").fadeIn(ANIMATION_TIME);
-      }
-      else {
-        $("#content").fadeIn(ANIMATION_TIME);
-      }
+      $(".display_nonauth").fadeIn(ANIMATION_TIME);
     }
   });
 
diff --git a/resources/views/about.ejs b/resources/views/about.ejs
index f8bd46c0a6e8c8abb0a579e8442f7056fca9c1a1..3bfe7009df690c0bb641074c635702e0332f3210 100644
--- a/resources/views/about.ejs
+++ b/resources/views/about.ejs
@@ -1,4 +1,4 @@
-<div id="content">
+<div id="content" class="display_always">
     <div id="about">
 
         <div class="video">
diff --git a/resources/views/forgot.ejs b/resources/views/forgot.ejs
index b280f3f463253fa63f3673465396e16c2031b611..7772a13f251b5914309d4916e817d6d6be488ecc 100644
--- a/resources/views/forgot.ejs
+++ b/resources/views/forgot.ejs
@@ -1,4 +1,4 @@
-<div id="vAlign">   
+<div id="vAlign" class="display_always">   
     <div id="signUpFormWrap">
         <!-- XXX this form submits to nowhere -->
         <form id="signUpForm" class="cf authform">
diff --git a/resources/views/index.ejs b/resources/views/index.ejs
index 74922b3012566a2ffe4d4ee10c019edd8b11a797..6873159afed75c94a1ed99549570c79f19f4ad85 100644
--- a/resources/views/index.ejs
+++ b/resources/views/index.ejs
@@ -1,4 +1,4 @@
-  <div id="content" style="display:none">
+  <div id="content" style="display:none" class="display_auth">
       <div id="manage">
           <h1 class="serif">Account Manager</h1>
           <div class="edit cf">
@@ -13,7 +13,7 @@
       </div>
   </div>
 
-  <div id="vAlign">
+  <div id="vAlign" class="display_nonauth">
       <div id="signUp">
           <div id="card"><img src="/i/slit.png"></div>
           <div id="hint"></div>
diff --git a/resources/views/layout.ejs b/resources/views/layout.ejs
index 57f5a92fa61e9c6bf2efb55b6e39de1f91c4afec..c8009278cbd81dbc653f4d5c123d01671a6733a7 100644
--- a/resources/views/layout.ejs
+++ b/resources/views/layout.ejs
@@ -8,7 +8,7 @@
   <![endif]-->
   <link href='https://fonts.googleapis.com/css?family=Droid+Serif:400,400italic,700,700italic' rel='stylesheet' type='text/css'>
   <script src="/vepbundle" type="text/javascript"></script>
-  <% if (true || production) { %>
+  <% if (production) { %>
     <link rel="stylesheet" type="text/css" href="/css/browserid.min.css">
     <script src="/js/lib.min.js" type="text/javascript"></script>
   <% } else { %>
diff --git a/resources/views/privacy.ejs b/resources/views/privacy.ejs
index 8d7188a2ad68c373d9ae841a4259d2d11754ca4c..07b662d193210086615d8be2ea35f2702c41a1a3 100644
--- a/resources/views/privacy.ejs
+++ b/resources/views/privacy.ejs
@@ -1,4 +1,4 @@
-<div id="content">
+<div id="content" class="display_always">
     <div id="legal">
       <h2>Privacy & BrowserID</h2>
       
diff --git a/resources/views/signin.ejs b/resources/views/signin.ejs
index 0f37b0935d7e40aa39c392c7b5e11592d085076b..bb742f992d632fbb726cd7fff736f931355dc9c2 100644
--- a/resources/views/signin.ejs
+++ b/resources/views/signin.ejs
@@ -1,4 +1,4 @@
-<div id="vAlign">
+<div id="vAlign" class="disply_always">
     <div id="signUpFormWrap">
         <!-- XXX this form submits to nowhere -->
         <form id="signUpForm" class="cf authform" novalidate>
diff --git a/resources/views/signup.ejs b/resources/views/signup.ejs
index 4b9d7efd1e8d3257016c600dce6d202bffc87dd2..6a21ae41aa967d404519b8efbc3fe59d56e39858 100644
--- a/resources/views/signup.ejs
+++ b/resources/views/signup.ejs
@@ -1,4 +1,4 @@
-<div id="vAlign">   
+<div id="vAlign" class="display_always">   
     <div id="signUpFormWrap">
         <!-- XXX this form submits to nowhere -->
         <form id="signUpForm" class="cf authform" novalidate>
diff --git a/resources/views/tos.ejs b/resources/views/tos.ejs
index 53bae5ecb4ceed9c3164dcacbb091e6d6f9f892c..fe33bca8de3621d044749c3b821ac6a702585014 100644
--- a/resources/views/tos.ejs
+++ b/resources/views/tos.ejs
@@ -1,4 +1,4 @@
-<div id="content">
+<div id="content" class="display_always">
   <div id="legal">
   <h2>Terms of Service &mdash; Overview</h2>
   
diff --git a/resources/views/verifyemail.ejs b/resources/views/verifyemail.ejs
index b4f4e0eb0a3a4930b4b217fcf2dbc5285cd2db1f..d9ee49385494c4069cba00874bbe0023e661a419 100644
--- a/resources/views/verifyemail.ejs
+++ b/resources/views/verifyemail.ejs
@@ -1,4 +1,4 @@
-<div id="vAlign">   
+<div id="vAlign" class="display_always">   
     <div id="signUpFormWrap">
         <div id="signUpForm" class="cf">
             <h1 class="serif">Email Verification</h1>
diff --git a/resources/views/verifyuser.ejs b/resources/views/verifyuser.ejs
index 3cca2c5284310bb92600274b5e04e6efc1b181fb..d3881d1d20cd50534f031e0c8e88654d43540899 100644
--- a/resources/views/verifyuser.ejs
+++ b/resources/views/verifyuser.ejs
@@ -1,4 +1,4 @@
-<div id="vAlign">   
+<div id="vAlign" class="display_always">   
   <div id="signUpFormWrap">
     <ul class="notifications">
         <li class="notification error" id="badtoken">There was a problem with your signup link.  Has this address already been registered?</li>