diff --git a/_extensions/odoo_ext/layout.html b/_extensions/odoo_ext/layout.html
index 55de1a423..f87b480ee 100644
--- a/_extensions/odoo_ext/layout.html
+++ b/_extensions/odoo_ext/layout.html
@@ -47,119 +47,7 @@
 
 {%- block header -%}
   <header class="o_main_header o_has_sub_nav o_inverted {{ ' '.join(classes) }}">
-    <div class="o_main_header_main">
-      <a class="pull-left o_logo" href="/"></a>
-      <a href="#" class="o_mobile_menu_toggle visible-xs-block pull-right">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="mdi-navigation-menu"></span>
-      </a>
-      <div class="o_header_buttons">
-        <a href="https://www.odoo.com/trial" class="btn btn-primary">Start Now</a>
-      </div>
-      <ul class="o_primary_nav">
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle">Apps</a>
-          <div class="dropdown-menu o_secondary_nav">
-            <div class="container">
-              <div class="row">
-                <div class="col-sm-3 o_website_apps">
-                  <div class="o_nav_app_family">
-                    <span></span> Websites
-                    <div>Build great user experience</div>
-                  </div>
-                  <ul>
-                    <li><a href="https://www.odoo.com/page/website-builder">Website Builder</a></li>
-                    <li><a href="https://www.odoo.com/page/e-commerce">eCommerce</a></li>
-                    <li><a href="https://www.odoo.com/page/blog-engine">Blogs</a></li>
-                    <li><a href="https://www.odoo.com/page/community-builder">Forums</a></li>
-                    <li><a href="https://www.odoo.com/page/slides">Slides</a></li>
-                  </ul>
-                </div>
-                <div class="col-sm-3 o_sale_apps">
-                  <div class="o_nav_app_family">
-                    <span></span> Sales
-                    <div>Boost your success rate</div>
-                  </div>
-                  <ul>
-                    <li><a href="https://www.odoo.com/page/sales">Sales</a></li>
-                    <li><a href="https://www.odoo.com/page/crm">CRM</a></li>
-                    <li><a href="https://www.odoo.com/page/billing">Invoicing</a></li>
-                    <li class="dropdown">
-                      <a href="#0" class="dropdown-toggle">Point of Sale</a>
-                      <ul>
-                        <li><a href="https://www.odoo.com/page/point-of-sale">Shops</a></li>
-                        <li><a href="https://www.odoo.com/page/pos-restaurant">Restaurants</a></li>
-                      </ul>
-                    </li>
-                    <li><a href="https://www.odoo.com/page/subscriptions">Subscriptions</a></li>
-                    <li><a href="https://www.odoo.com/page/sign">Sign</a></li>
-                  </ul>
-                </div>
-                <div class="col-sm-3 o_operation_apps">
-                  <div class="o_nav_app_family">
-                    <span></span> Operations
-                    <div>It's all about efficiency</div>
-                  </div>
-                  <ul>
-                    <li><a href="https://www.odoo.com/page/accounting">Accounting</a></li>
-                    <li><a href="https://www.odoo.com/page/project-management">Project</a></li>
-                    <li class="dropdown">
-                      <a href="#0" class="dropdown-toggle">Human Resources</a>
-                      <ul>
-                        <li><a href="https://www.odoo.com/page/recruitment">Recruitment</a></li>
-                        <li><a href="https://www.odoo.com/page/employees">Employees</a></li>
-                        <li><a href="https://www.odoo.com/page/expenses">Expenses</a></li>
-                        <li><a href="https://www.odoo.com/page/appraisal">Appraisal</a></li>
-                        <li><a href="https://www.odoo.com/page/fleet">Fleet</a></li>
-                        <li><a href="https://www.odoo.com/page/leaves">Leaves</a></li>
-                      </ul>
-                    </li>
-                    <li><a href="https://www.odoo.com/page/warehouse">Inventory</a></li>
-                    <li><a href="https://www.odoo.com/page/purchase">Purchase</a></li>
-                    <li class="dropdown">
-                      <a href="#0" class="dropdown-toggle">Manufacturing</a>
-                      <ul>
-                        <li><a href="https://www.odoo.com/page/manufacturing">MRP</a></li>
-                        <li><a href="https://www.odoo.com/page/plm">PLM</a></li>
-                        <li><a href="https://www.odoo.com/page/maintenance">Maintenance</a></li>
-                        <li><a href="https://www.odoo.com/page/quality">Quality</a></li>
-                      </ul>
-                    </li>
-                  </ul>
-                </div>
-                <div class="col-sm-3 o_productivity_apps">
-                  <div class="o_nav_app_family">
-                    <span></span> Productivity Tools
-                    <div>Great Tools = Happy People</div>
-                  </div>
-                  <ul>
-                    <li class="dropdown">
-                      <a href="#0" class="dropdown-toggle">Communication</a>
-                      <ul>
-                        <li><a href="https://www.odoo.com/page/discuss">Discuss</a></li>
-                        <li><a href="https://www.odoo.com/page/discuss-groups">Mailing Lists</a></li>
-                        <li><a href="https://www.odoo.com/page/notes">Notes</a></li>
-                        <li><a href="#">Help desk</a></li>
-                        <li><a href="#">Appointment</a></li>
-                      </ul>
-                    </li>
-                    <li><a href="https://www.odoo.com/page/timesheet">Timesheet</a></li>
-                    <li><a href="https://www.odoo.com/page/email-marketing">Email Marketing</a></li>
-                    <li><a href="https://www.odoo.com/page/events">Events</a></li>
-                    <li><a href="https://www.odoo.com/page/survey">Survey</a></li>
-                    <li><a href="https://www.odoo.com/page/live-chat">Live Chat</a></li>
-                  </ul>
-                </div>
-              </div>
-            </div>
-            <a href="https://www.odoo.com/apps/modules" class="o_store_link"><i class="fa fa-cube fa-fw"></i> Third party apps</a>
-          </div>
-        </li>
-        <li><a href="https://www.odoo.com/page/tour">Tour</a></li>
-        <li><a href="https://www.odoo.com/pricing">Pricing</a></li>
-        <li><a href="https://www.odoo.com/page/docs">Docs</a></li>
-      </ul>
-    </div>
+    {% include "odoo_header.html" %}
     <nav class="navbar o_sub_nav">
       <div class="container">
         <div class="navbar-header visible-xs">
@@ -280,79 +168,6 @@
     </div>
   </div>
   <footer>
-    <div id="footer" class="container">
-      <span class="o_logo o_logo_inverse center-block o_footer_logo"></span>
-      <div class="row">
-        <div class="col-sm-7 col-md-7 col-lg-6">
-          <div class="row">
-            <div class="col-xs-6 col-sm-4">
-              <span class="menu_title">Community</span>
-              <ul>
-                <li><a href="https://github.com/odoo/odoo">Github</a></li>
-                <li><a href="https://www.odoo.com/page/download">Download</a></li>
-                <li class="divider"></li>
-                <li><a href="https://runbot.odoo.com/">Runbot</a></li>
-                <li><a href="https://github.com/odoo/odoo/wiki/Translations">Translations</a></li>
-                <li class="divider"></li>
-                <li><a href="https://www.odoo.com/page/odoo-community">Mailing Lists</a></li>
-                <li><a href="https://www.odoo.com/forum/help-1">Forum</a></li>
-              </ul>
-            </div>
-            <div class="col-xs-6 col-sm-4">
-              <span class="menu_title">Services</span>
-              <ul>
-                <li><a href="https://www.odoo.sh">Odoo Cloud Platform</a></li>
-                <li class="divider"></li>
-                <li><a href="http://www.odoo.com/help">Support</a></li>
-                <li><a href="https://upgrade.odoo.com">Upgrade</a></li>
-                <li class="divider"></li>
-                <li><a href="https://www.odoo.com/partners">Find a partner</a></li>
-                <li><a href="https://www.odoo.com/page/become-a-partner">Become a partner</a></li>
-                <li class="divider"></li>
-                <li><a href="https://training.odoo.com/courses/odoo-functional">Training Center</a></li>
-                <li><a href="https://www.odoo.com/page/education-program">Education</a></li>
-                <li class="divider"></li>
-                <li><a href="https://www.odoo.com/page/security">Security</a></li>
-              </ul>
-            </div>
-            <div class="col-xs-12 col-sm-4 mb64">
-              <span class="menu_title">About us</span>
-              <ul>
-                <li><a href="https://www.odoo.com/page/about-us">Our company</a></li>
-                <li><a href="https://www.odoo.com/page/contactus">Contact</a></li>
-                <li class="divider" />
-                <li><a href="https://www.odoo.com/event">Events</a></li>
-                <li><a href="https://www.odoo.com/blog">Blog</a></li>
-                <li><a href="https://www.odoo.com/blog/6">Customers</a></li>
-                <li class="divider" />
-                <li><a href="https://www.odoo.com/jobs">Jobs</a></li>
-                <li class="divider" />
-                <li><a href="https://www.odoo.com/page/legal">Legal</a> | <a href="https://www.odoo.com/privacy">Privacy</a></li>
-              </ul>
-            </div>
-          </div>
-        </div>
-        <div class="col-sm-5 col-md-4 col-md-offset-1 col-lg-5 col-lg-offset-1">
-          <p>
-            <small>
-              Odoo is a suite of open source business apps that cover all your company needs: CRM, eCommerce, accounting, inventory, point of sale, project management, etc.
-              <br/><br/>
-              Odoo's unique value proposition is to be at the same time very easy to use and fully integrated.
-            </small>
-          </p>
-        </div>
-      </div>
-    </div>
-    <div class="o_footer_bottom">
-      <div class="container">
-        <a class="small" href="https://www.odoo.com/page/website-builder">Website made with <span class="o_logo o_logo_inverse o_logo_15"></span></a>
-        <div class="social-links pull-right">
-          <a href="https://www.odoo.com/web/about/facebook"><i class="fa fa-facebook"></i></a>
-          <a href="https://www.odoo.com/web/about/twitter"><i class="fa fa-twitter"></i></a>
-          <a href="https://www.odoo.com/web/about/linkedin"><i class="fa fa-linkedin"></i></a>
-          <a href="mailto:info@odoo.com"><i class="fa fa-envelope"></i></a>
-        </div>
-      </div>
-    </div>
+    {% include "odoo_footer.html" %}
   </footer>
 {%- endblock -%}
diff --git a/_extensions/odoo_ext/odoo_footer.html b/_extensions/odoo_ext/odoo_footer.html
new file mode 100644
index 000000000..b24979464
--- /dev/null
+++ b/_extensions/odoo_ext/odoo_footer.html
@@ -0,0 +1,77 @@
+<div id="footer" class="container">
+    <span class="o_logo o_logo_inverse center-block o_footer_logo"></span>
+    <div class="row">
+        <div class="col-sm-7 col-md-7 col-lg-6">
+            <div class="row">
+                <div class="col-xs-6 col-sm-4">
+                    <span class="menu_title">Community</span>
+                    <ul>
+                        <li><a href="https://github.com/odoo/odoo">Github</a></li>
+                        <li><a href="https://www.odoo.com/page/download">Download</a></li>
+                        <li class="divider"></li>
+                        <li><a href="https://runbot.odoo.com/">Runbot</a></li>
+                        <li><a href="https://github.com/odoo/odoo/wiki/Translations">Translations</a></li>
+                        <li class="divider"></li>
+                        <li><a href="https://www.odoo.com/page/odoo-community">Mailing Lists</a></li>
+                        <li><a href="https://www.odoo.com/forum/help-1">Forum</a></li>
+                    </ul>
+                </div>
+                <div class="col-xs-6 col-sm-4">
+                    <span class="menu_title">Services</span>
+                    <ul>
+                        <li><a href="https://www.odoo.sh">Odoo Cloud Platform</a></li>
+                        <li class="divider"></li>
+                        <li><a href="https://www.odoo.com/help">Support</a></li>
+                        <li><a href="https://upgrade.odoo.com">Upgrade</a></li>
+                        <li class="divider"></li>
+                        <li><a href="https://www.odoo.com/partners">Find a partner</a></li>
+                        <li><a href="https://www.odoo.com/page/become-a-partner">Become a partner</a></li>
+                        <li class="divider"></li>
+                        <li><a href="https://training.odoo.com/courses/odoo-functional">Training Center</a></li>
+                        <li><a href="https://www.odoo.com/page/education-program">Education</a></li>
+                        <li class="divider"></li>
+                        <li><a href="https://www.odoo.com/page/security">Security</a></li>
+                    </ul>
+                </div>
+                <div class="col-xs-12 col-sm-4 mb64">
+                    <span class="menu_title">About us</span>
+                    <ul>
+                        <li><a href="https://www.odoo.com/page/about-us">Our company</a></li>
+                        <li><a href="https://www.odoo.com/page/contactus">Contact</a></li>
+                        <li class="divider" />
+                        <li><a href="https://www.odoo.com/event">Events</a></li>
+                        <li><a href="https://www.odoo.com/blog">Blog</a></li>
+                        <li><a href="https://www.odoo.com/blog/6">Customers</a></li>
+                        <li class="divider" />
+                        <li><a href="https://www.odoo.com/jobs">Jobs</a></li>
+                        <li class="divider" />
+                        <li><a href="https://www.odoo.com/page/legal">Legal</a> | <a
+                                href="https://www.odoo.com/privacy">Privacy</a></li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <div class="col-sm-5 col-md-4 col-md-offset-1 col-lg-5 col-lg-offset-1">
+            <p>
+                <small>
+                    Odoo is a suite of open source business apps that cover all your company needs: CRM, eCommerce,
+                    accounting, inventory, point of sale, project management, etc.
+                    <br /><br />
+                    Odoo's unique value proposition is to be at the same time very easy to use and fully integrated.
+                </small>
+            </p>
+        </div>
+    </div>
+</div>
+<div class="o_footer_bottom">
+    <div class="container">
+        <a class="small" href="https://www.odoo.com/page/website-builder">Website made with <span
+                class="o_logo o_logo_inverse o_logo_15"></span></a>
+        <div class="social-links pull-right">
+            <a href="https://www.odoo.com/web/about/facebook"><i class="fa fa-facebook"></i></a>
+            <a href="https://www.odoo.com/web/about/twitter"><i class="fa fa-twitter"></i></a>
+            <a href="https://www.odoo.com/web/about/linkedin"><i class="fa fa-linkedin"></i></a>
+            <a href="mailto:info@odoo.com"><i class="fa fa-envelope"></i></a>
+        </div>
+    </div>
+</div>
diff --git a/_extensions/odoo_ext/odoo_header.html b/_extensions/odoo_ext/odoo_header.html
new file mode 100644
index 000000000..fe0992e2c
--- /dev/null
+++ b/_extensions/odoo_ext/odoo_header.html
@@ -0,0 +1,114 @@
+<div class="o_main_header_main">
+    <a class="pull-left o_logo" href="/"></a>
+    <a href="#" class="o_mobile_menu_toggle visible-xs-block pull-right">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="mdi-navigation-menu"></span>
+    </a>
+    <div class="o_header_buttons">
+        <a href="https://www.odoo.com/trial" class="btn btn-primary">Start Now</a>
+    </div>
+    <ul class="o_primary_nav">
+        <li class="dropdown">
+            <a href="#" class="dropdown-toggle">Apps</a>
+            <div class="dropdown-menu o_secondary_nav">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-sm-3 o_website_apps">
+                            <div class="o_nav_app_family">
+                                <span></span> Websites
+                                <div>Build great user experience</div>
+                            </div>
+                            <ul>
+                                <li><a href="https://www.odoo.com/page/website-builder">Website Builder</a></li>
+                                <li><a href="https://www.odoo.com/page/e-commerce">eCommerce</a></li>
+                                <li><a href="https://www.odoo.com/page/blog-engine">Blogs</a></li>
+                                <li><a href="https://www.odoo.com/page/community-builder">Forums</a></li>
+                                <li><a href="https://www.odoo.com/page/slides">Slides</a></li>
+                            </ul>
+                        </div>
+                        <div class="col-sm-3 o_sale_apps">
+                            <div class="o_nav_app_family">
+                                <span></span> Sales
+                                <div>Boost your success rate</div>
+                            </div>
+                            <ul>
+                                <li><a href="https://www.odoo.com/page/sales">Sales</a></li>
+                                <li><a href="https://www.odoo.com/page/crm">CRM</a></li>
+                                <li><a href="https://www.odoo.com/page/billing">Invoicing</a></li>
+                                <li class="dropdown">
+                                    <a href="#0" class="dropdown-toggle">Point of Sale</a>
+                                    <ul>
+                                        <li><a href="https://www.odoo.com/page/point-of-sale">Shops</a></li>
+                                        <li><a href="https://www.odoo.com/page/pos-restaurant">Restaurants</a></li>
+                                    </ul>
+                                </li>
+                                <li><a href="https://www.odoo.com/page/subscriptions">Subscriptions</a></li>
+                                <li><a href="https://www.odoo.com/page/sign">Sign</a></li>
+                            </ul>
+                        </div>
+                        <div class="col-sm-3 o_operation_apps">
+                            <div class="o_nav_app_family">
+                                <span></span> Operations
+                                <div>It's all about efficiency</div>
+                            </div>
+                            <ul>
+                                <li><a href="https://www.odoo.com/page/accounting">Accounting</a></li>
+                                <li><a href="https://www.odoo.com/page/project-management">Project</a></li>
+                                <li class="dropdown">
+                                    <a href="#0" class="dropdown-toggle">Human Resources</a>
+                                    <ul>
+                                        <li><a href="https://www.odoo.com/page/recruitment">Recruitment</a></li>
+                                        <li><a href="https://www.odoo.com/page/employees">Employees</a></li>
+                                        <li><a href="https://www.odoo.com/page/expenses">Expenses</a></li>
+                                        <li><a href="https://www.odoo.com/page/appraisal">Appraisal</a></li>
+                                        <li><a href="https://www.odoo.com/page/fleet">Fleet</a></li>
+                                        <li><a href="https://www.odoo.com/page/leaves">Leaves</a></li>
+                                    </ul>
+                                </li>
+                                <li><a href="https://www.odoo.com/page/warehouse">Inventory</a></li>
+                                <li><a href="https://www.odoo.com/page/purchase">Purchase</a></li>
+                                <li class="dropdown">
+                                    <a href="#0" class="dropdown-toggle">Manufacturing</a>
+                                    <ul>
+                                        <li><a href="https://www.odoo.com/page/manufacturing">MRP</a></li>
+                                        <li><a href="https://www.odoo.com/page/plm">PLM</a></li>
+                                        <li><a href="https://www.odoo.com/page/maintenance">Maintenance</a></li>
+                                        <li><a href="https://www.odoo.com/page/quality">Quality</a></li>
+                                    </ul>
+                                </li>
+                            </ul>
+                        </div>
+                        <div class="col-sm-3 o_productivity_apps">
+                            <div class="o_nav_app_family">
+                                <span></span> Productivity Tools
+                                <div>Great Tools = Happy People</div>
+                            </div>
+                            <ul>
+                                <li class="dropdown">
+                                    <a href="#0" class="dropdown-toggle">Communication</a>
+                                    <ul>
+                                        <li><a href="https://www.odoo.com/page/discuss">Discuss</a></li>
+                                        <li><a href="https://www.odoo.com/page/discuss-groups">Mailing Lists</a></li>
+                                        <li><a href="https://www.odoo.com/page/notes">Notes</a></li>
+                                        <li><a href="#">Help desk</a></li>
+                                        <li><a href="#">Appointment</a></li>
+                                    </ul>
+                                </li>
+                                <li><a href="https://www.odoo.com/page/timesheet">Timesheet</a></li>
+                                <li><a href="https://www.odoo.com/page/email-marketing">Email Marketing</a></li>
+                                <li><a href="https://www.odoo.com/page/events">Events</a></li>
+                                <li><a href="https://www.odoo.com/page/survey">Survey</a></li>
+                                <li><a href="https://www.odoo.com/page/live-chat">Live Chat</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+                <a href="https://www.odoo.com/apps/modules" class="o_store_link"><i class="fa fa-cube fa-fw"></i> Third
+                    party apps</a>
+            </div>
+        </li>
+        <li><a href="https://www.odoo.com/page/tour">Tour</a></li>
+        <li><a href="https://www.odoo.com/pricing">Pricing</a></li>
+        <li><a href="https://www.odoo.com/page/docs">Docs</a></li>
+    </ul>
+</div>
diff --git a/_extensions/odoo_ext/static/footer.less b/_extensions/odoo_ext/static/footer.less
index d5019e29c..7aa934990 100644
--- a/_extensions/odoo_ext/static/footer.less
+++ b/_extensions/odoo_ext/static/footer.less
@@ -1,4 +1,5 @@
 // Based on http://www.odoo.com/openerp_website/static/src/less/footer.less
+// FIXME all this logic shouldn't be static ...
 // ========================================================================
 
 body > footer {
diff --git a/_extensions/odoo_ext/static/header.less b/_extensions/odoo_ext/static/header.less
index 7a5c8f849..0526a19fa 100644
--- a/_extensions/odoo_ext/static/header.less
+++ b/_extensions/odoo_ext/static/header.less
@@ -1,4 +1,5 @@
 // Based on http://www.odoo.com/openerp_website/static/src/less/header.less
+// FIXME all this logic shouldn't be static ...
 // ========================================================================
 
 // =============  MIXINS
diff --git a/_extensions/odoo_ext/static/variables.less b/_extensions/odoo_ext/static/variables.less
index d337f7968..0faa83234 100644
--- a/_extensions/odoo_ext/static/variables.less
+++ b/_extensions/odoo_ext/static/variables.less
@@ -1,4 +1,5 @@
 // Based on http://www.odoo.com/openerp_website/static/src/less/variables.less
+// FIXME all this logic shouldn't be static ...
 // ============================================================================
 
 // Prefixes