diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 424ad9ec5ec..57acf28413a 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -162,7 +162,7 @@ header.navbar-fixed-top {
 .dark {
   background: #eff8f8;
 }
-
+/* ----- BOOTSTRAP HACK FOR STICKY carousel-control ----- */
 .carousel-control {
   top: 40%;
   left: 15px;
@@ -177,10 +177,29 @@ header.navbar-fixed-top {
   -moz-border-radius: 23px;
   border-radius: 23px;
 }
-
-.divider-vertical {
-  height: 50px;
-  margin: 0 9px;
-  border-right: 1px solid #222222;
-  border-left: 1px solid #111111;
+/* ----- BOOTSTRAP HACK FOR STICKY header tags ----- */
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+  font-weight: 900;
 }
+
+.container>.navbar-header, .container>.navbar-collapse {
+  margin-left: -15px;
+}
+.navbar-form {
+  padding: 0;
+  margin-top: 0;
+}
+.navbar-form .btn {
+  margin-top: 3px;
+  margin-bottom: -5px;
+}
+header {
+  margin-bottom: 0px;
+  min-height: 40px;
+}
+header .collapse ul {
+  margin-top: 5px;
+}
+.navbar-nav>li>a {
+  padding:10px 15px 10px;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 1eb60a70067..ef6dc5d9ba6 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -136,8 +136,12 @@ header.navbar-fixed-top
     -moz-border-radius: 23px
     border-radius: 23px
 
-.divider-vertical
-    height: 50px
-    margin: 0 9px
-    border-right: 1px solid #222222
-    border-left: 1px solid #111111
\ No newline at end of file
+header
+    margin-bottom: 0px
+    min-height: 40px
+    .collapse ul
+        margin-top: 5px
+
+.navbar-nav >li >a
+  padding:10px 15px 10px
+      
\ No newline at end of file
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 50d701f2e96..1962d369b65 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -53,6 +53,7 @@
                     <body>
                         <header class='navbar-static-top'>
                             <nav class="navbar-default" role="navigation">
+                                <div class="container">
                                 <!-- Brand and toggle get grouped for better mobile display -->
                                 <div class="navbar-header">
                                     <a class="navbar-brand" href="/page/website.homepage"><em>Open</em><b>ERP</b></a>
@@ -64,6 +65,7 @@
                                         <li><a href="/admin">Sign in</a></li>
                                     </ul>
                                 </div><!-- /.navbar-collapse -->
+                                </div>
                             </nav>
                         </header>
                         <div t-raw="0" id="wrap">
@@ -115,7 +117,7 @@
                                     Create a <a href="http://openerp.com/apps/website">free website</a> with
                                     <a class="label label-danger" href="https://openerp.com/apps/website">OpenERP</a>
                                 </div>
-                                <div class="pull-left muted">
+                                <div class="pull-left text-muted">
                                     Copyright &amp;copy; <span t-field="res_company.name">Company name</span> - <a href="/sitemap">Sitemap</a>
                                 </div>
                             </div>
@@ -188,7 +190,7 @@
                                         dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
                                         proident, sunt in culpa qui officia deserunt mollit anim id est laborum
                                     </p>
-                                    <div class="text-center"> <a href="http://www.openerp.com/start" class="btn btn-default mt16 btn-lg btn-primary">Call To <em>Action</em></a></div>
+                                    <div class="text-center"> <a href="http://www.openerp.com/start" class="btn mt16 btn-lg btn-primary">Call To <em>Action</em></a></div>
                                 </div>
                             </div>
                         </section>
@@ -256,9 +258,9 @@
                     <div class="well mt32">
                         <p>This page does not exists, but you can create it as you are administrator of this site.</p> 
                         <a class="btn btn-primary" t-att-href="'/pagenew/'+path">Create Page</a> 
-                        <span class="muted">or</span> <a href="/sitemap">Search a Page</a>
+                        <span class="text-muted">or</span> <a href="/sitemap">Search a Page</a>
                     </div>
-                    <div class="text-center muted">Edit the content bellow this line to adapt the default "page not found" page.</div>
+                    <div class="text-center text-muted">Edit the content bellow this line to adapt the default "page not found" page.</div>
                 </div>
                 <hr />
                 <div class="container">