diff --git a/public/css/cover.css b/public/css/cover.css
index a479a3a..4887266 100644
--- a/public/css/cover.css
+++ b/public/css/cover.css
@@ -137,7 +137,7 @@ body {
     margin-top: 90px;
   }
   .cover.render {
-    margin-top: 0px;
+    margin-top: 90px;
   }
   /* Pull out the header and footer */
   .masthead {
diff --git a/public/css/lufi.css b/public/css/lufi.css
index 66bdceb..bbd100e 100644
--- a/public/css/lufi.css
+++ b/public/css/lufi.css
@@ -31,3 +31,9 @@ a.classic:hover,
 a.classic:focus {
     color: #337AB7;
 }
+.left-mg {
+    margin-left: 10px;
+}
+@-moz-document url-prefix() {
+    fieldset { display: table-cell; }
+}
diff --git a/templates/about.html.ep b/templates/about.html.ep
index a04c5c2..dfbe27a 100644
--- a/templates/about.html.ep
+++ b/templates/about.html.ep
@@ -1,5 +1,5 @@
 % # vim:set sw=4 ts=4 sts=4 ft=html.epl expandtab:
-<div class="inner cover render text-left">
+<div class="text-left">
     <h3><%= l('What is Lufi?') %></h3>
     <p><%= l('Lufi is a free (as in free speech) file hosting software.') %></p>
     <h3><%= l('Privacy') %></h3>
diff --git a/templates/delays.html.ep b/templates/delays.html.ep
index 0afefd7..9a2c242 100644
--- a/templates/delays.html.ep
+++ b/templates/delays.html.ep
@@ -1,6 +1,5 @@
 % # vim:set sw=4 ts=4 sts=4 ft=html.epl expandtab:
 % use Number::Bytes::Human qw(format_bytes);
-<div class="inner cover render">
     <h1><%= l('Information about delays') %></h1>
     <div class="text-left">
         <p><%= l('If you choose a delay, the file will be deleted after that delay.') %><br>
@@ -32,4 +31,3 @@
         </ul>
     </div>
 % }
-</div>
diff --git a/templates/files.html.ep b/templates/files.html.ep
index f367afb..90afdba 100644
--- a/templates/files.html.ep
+++ b/templates/files.html.ep
@@ -3,7 +3,7 @@
 <hr>
 
 <p>
-    <a href="#" onclick="purgeExpired();" class="pull-right btn btn-info btn-xs"><%= l('Purge expired files from localStorage') %></a>
+    <a href="#" onclick="purgeExpired();" class="pull-right btn btn-info btn-xs left-mg"><%= l('Purge expired files from localStorage') %></a>
     <%= l('Only the files sent with this browser will be listed here. The informations are stored in localStorage: if you delete your localStorage data, you\'ll loose this informations.') %>
 </p>
 
diff --git a/templates/index.html.ep b/templates/index.html.ep
index 155b0c1..33ba31f 100644
--- a/templates/index.html.ep
+++ b/templates/index.html.ep
@@ -4,7 +4,6 @@
 %   delay_1   => l('24 hours'),
 %   delay_365 => l('1 year')
 % );
-<div class="inner cover">
     <div class="form-group row">
 % if (defined(config('broadcast_message'))) {
         <div  class="col-sm-12 col-xs-12">
@@ -68,7 +67,6 @@
         <ul class="list-group" id="ul-results">
         </ul>
     </div>
-</div>
 %= javascript begin
 var ws_url  = '<%= url_for('upload')->to_abs() %>';
 var baseURL = '<%= url_for('/')->to_abs() %>';
diff --git a/templates/layouts/default.html.ep b/templates/layouts/default.html.ep
index 808f230..0b3a6b5 100644
--- a/templates/layouts/default.html.ep
+++ b/templates/layouts/default.html.ep
@@ -43,7 +43,9 @@
                             </nav>
                         </div>
                     </div>
-                    <%= content %>
+                    <div class="inner cover render">
+                        <%= content %>
+                    </div>
                     <!-- <div class="mastfoot">
                         <div class="inner">
                             <p>Lufi, &copy; 2015 <a href="https://fiat-tux.fr">Luc Didry</a>, <a href="https://gnu.org/licenses/agpl.html">GNU Affero Public License</a></p>
diff --git a/templates/mail.html.ep b/templates/mail.html.ep
index a47c71d..5914800 100644
--- a/templates/mail.html.ep
+++ b/templates/mail.html.ep
@@ -1,5 +1,4 @@
 % # vim:set sw=4 ts=4 sts=4 ft=html.epl expandtab:
-<div class="inner cover render">
 % if (defined(stash('msg'))) {
     <div class="alert alert-warning"><%= stash('msg') %></div>
 % }
@@ -35,7 +34,6 @@
         <button type="submit" class="btn btn-info"><%= l('Send with this server') %></button>
         <a href="#" class="btn btn-primary" id="mailto"><%= l('Send with your own mail software') %></a>
     </form>
-</div>
 %= javascript begin
     function findItem(name) {
         var files = localStorage.getItem('files');
diff --git a/templates/msg.html.ep b/templates/msg.html.ep
index 8732444..d46d120 100644
--- a/templates/msg.html.ep
+++ b/templates/msg.html.ep
@@ -1,5 +1,4 @@
 % # vim:set sw=4 ts=4 sts=4 ft=html.epl expandtab:
-<div class="inner cover render">
 % if (!defined(stash('f')) && defined(stash('msg'))) {
     <div class="alert alert-warning"><%= stash('msg') %></div>
 % } elsif (defined(stash('msg_success'))) {
@@ -8,4 +7,3 @@
     <h2><%= stash('f')->filename %></h2>
     <div class="alert alert-info"><%= stash('msg') %></div>
 % }
-</div>
diff --git a/templates/render.html.ep b/templates/render.html.ep
index 99e10d1..2496dc8 100644
--- a/templates/render.html.ep
+++ b/templates/render.html.ep
@@ -1,5 +1,4 @@
 % # vim:set sw=4 ts=4 sts=4 ft=html.epl expandtab:
-<div class="inner cover render">
 % if (!defined(stash('f')) && defined(stash('msg'))) {
     <div class="alert alert-danger"><%= stash('msg') %></div>
 % } else {
@@ -26,4 +25,3 @@ var i18n   = {
 %= javascript '/js/lufi-down.js'
     % }
 % }
-</div>