diff --git a/management/templates/index.html b/management/templates/index.html
index ea3b57a..85ca49c 100644
--- a/management/templates/index.html
+++ b/management/templates/index.html
@@ -115,20 +115,20 @@
       </div>
     </div>
 
-    <div class="container-fluid">
-      <div id="panel_system_status" class="container panel">
+    <div class="container">
+      <div id="panel_system_status" class="panel">
       {% include "system-status.html" %}
       </div>
 
-      <div id="panel_system_backup" class="container panel">
+      <div id="panel_system_backup" class="panel">
       {% include "system-backup.html" %}
       </div>
 
-      <div id="panel_external_dns" class="container panel">
+      <div id="panel_external_dns" class="panel">
       {% include "external-dns.html" %}
       </div>
 
-      <div id="panel_custom_dns" class="container panel">
+      <div id="panel_custom_dns" class="panel">
       {% include "custom-dns.html" %}
       </div>
 
@@ -136,27 +136,27 @@
       {% include "login.html" %}
       </div>
 
-      <div id="panel_mail-guide" class="container panel">
+      <div id="panel_mail-guide" class="panel">
       {% include "mail-guide.html" %}
       </div>
 
-      <div id="panel_users" class="container panel">
+      <div id="panel_users" class="panel">
       {% include "users.html" %}
       </div>
 
-      <div id="panel_aliases" class="container panel">
+      <div id="panel_aliases" class="panel">
       {% include "aliases.html" %}
       </div>
 
-      <div id="panel_sync_guide" class="container panel">
+      <div id="panel_sync_guide" class="panel">
       {% include "sync-guide.html" %}
       </div>
 
-      <div id="panel_web" class="container panel">
+      <div id="panel_web" class="panel">
       {% include "web.html" %}
       </div>
 
-      <div id="panel_ssl" class="container panel">
+      <div id="panel_ssl" class="panel">
       {% include "ssl.html" %}
       </div>
 
diff --git a/management/templates/login.html b/management/templates/login.html
index 8a0e99e..eedc196 100644
--- a/management/templates/login.html
+++ b/management/templates/login.html
@@ -1,7 +1,7 @@
 <h1 style="margin: 1em; text-align: center">{{hostname}}</h1>
 
 {% if no_admins_exist %}
-<div class="container">
+<div class="row">
 <div class="col-md-offset-2 col-md-8">
   <p class="text-danger">There are no administrative users on this system! To make an administrative user,
   log into this machine using SSH (like when you first set it up) and run:</p>
@@ -12,27 +12,24 @@ sudo tools/mail.py user make-admin your@emailaddress.com</pre>
 </div>  
 {% endif %}
 
-<div class="row">
-  <div class="col-sm-offset-2 col-sm-8 col-md-offset-3 col-md-6 col-lg-offset-4 col-lg-4">
-    <center>
-      <p style="margin: 2em">Log in here for your Mail-in-a-Box control panel.</p>
-    </center>
+<p style="margin: 2em; text-align: center;">Log in here for your Mail-in-a-Box control panel.</p>
 
+<div style="margin: 0 auto; max-width: 32em;">
   <form class="form-horizontal" role="form" onsubmit="do_login(); return false;">
     <div class="form-group">
-      <label for="inputEmail3" class="col-sm-2 control-label">Email</label>
-      <div class="col-sm-10">
+      <label for="inputEmail3" class="col-sm-3 control-label">Email</label>
+      <div class="col-sm-9">
         <input name="email" type="email" class="form-control" id="loginEmail" placeholder="Email">
       </div>
     </div>
     <div class="form-group">
-      <label for="inputPassword3" class="col-sm-2 control-label">Password</label>
-      <div class="col-sm-10">
+      <label for="inputPassword3" class="col-sm-3 control-label">Password</label>
+      <div class="col-sm-9">
         <input name="password" type="password" class="form-control" id="loginPassword" placeholder="Password">
       </div>
     </div>
     <div class="form-group">
-      <div class="col-sm-offset-2 col-sm-10">
+      <div class="col-sm-offset-3 col-sm-9">
         <div class="checkbox">
           <label>
             <input name='remember' type="checkbox" id="loginRemember"> Remember me
@@ -41,12 +38,11 @@ sudo tools/mail.py user make-admin your@emailaddress.com</pre>
       </div>
     </div>
     <div class="form-group">
-      <div class="col-sm-offset-2 col-sm-10">
+      <div class="col-sm-offset-3 col-sm-9">
         <button type="submit" class="btn btn-default">Sign in</button>
       </div>
     </div>
   </form>
-  </div>
 </div>