diff --git a/biscuit/core/static/css/style.css b/biscuit/core/static/css/style.css
index 3fb2b16571e36d2427496b0f8717d5977a2dcced..649ab7a285b11e34f8358b73d96ba8cda79f3d69 100644
--- a/biscuit/core/static/css/style.css
+++ b/biscuit/core/static/css/style.css
@@ -15,6 +15,15 @@ body {
   line-height: 60px;
 }
 
+body > .container {
+  padding: 60px 15px 0;
+}
+
+.footer > .container {
+  padding-right: 15px;
+  padding-left: 15px;
+}
+
 img.person-img {
         max-height: 300px;
 }
diff --git a/biscuit/core/templates/core/base.html b/biscuit/core/templates/core/base.html
index 63d3df901f26312365de4950f4b2068d8c948d9d..cb12d4151a352ebd59f23834ef1dae4ff3dcef1b 100644
--- a/biscuit/core/templates/core/base.html
+++ b/biscuit/core/templates/core/base.html
@@ -19,7 +19,8 @@
 {% endblock %}
 
 {% block bootstrap4_content %}
- <nav class="navbar navbar-dark bg-dark navbar-expand-md">
+ <header>
+ <nav class="navbar navbar-dark bg-dark navbar-expand-md fixed-top">
     <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#navbar-main">
      {% fa 'fa-align-justify' %}
     </button>
@@ -33,6 +34,7 @@
     </ul>
    </div>
  </nav>
+ </header>
 
  <main role="main" class="container">
   {% bootstrap_messages %}