diff --git a/addons/website/views/themes.xml b/addons/website/views/themes.xml
index 65611ce79e0..2f7ef94ca38 100644
--- a/addons/website/views/themes.xml
+++ b/addons/website/views/themes.xml
@@ -221,6 +221,8 @@
   </xpath>
 </template>
 
+<!-- Option font -->
+
 <template id="option_font" name="option_font" inherit_id="website.default_options" active="False" customize_show="False">
   <xpath expr="//t[@id='default_options']" position="inside">
     <link href="/website/static/src/less/option_font.less" rel="stylesheet" type="text/less"/>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index f68b8d493b0..243d3fd0eed 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -2,9 +2,75 @@
 <openerp>
     <data>
 
-<!-- Layout and generic templates -->
+<!-- Assets -->
 
-<template id="website.assets_frontend" name="Website assets">
+<template id="summernote" name="Summernote">
+    <script type="text/javascript" src="/website/static/src/js/openerp.define.js"></script>
+    <script>openerp.define.active();</script>
+    <script>openerp.define.next = 'summernote/core/async';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/core/async.js"></script>
+    <script>openerp.define.next = 'summernote/core/func';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/core/func.js"></script>
+    <script>openerp.define.next = 'summernote/core/agent';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/core/agent.js"></script>
+    <script>openerp.define.next = 'summernote/core/list';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/core/list.js"></script>
+    <script>openerp.define.next = 'summernote/core/dom';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/core/dom.js"></script>
+    <script>openerp.define.next = 'summernote/core/key';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/core/key.js"></script>
+    <script>openerp.define.next = 'summernote/core/range';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/core/range.js"></script>
+
+    <script>openerp.define.next = 'summernote/editing/Bullet';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/editing/Bullet.js"></script>
+    <script>openerp.define.next = 'summernote/editing/History';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/editing/History.js"></script>
+    <script>openerp.define.next = 'summernote/editing/Style';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/editing/Style.js"></script>
+    <script>openerp.define.next = 'summernote/editing/Table';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/editing/Table.js"></script>
+    <script>openerp.define.next = 'summernote/editing/Typing';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/editing/Typing.js"></script>
+    <script>openerp.define.next = 'summernote/editing/Editor';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/editing/Editor.js"></script>
+
+    <script>openerp.define.next = 'summernote/module/Button';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/module/Button.js"></script>
+    <script>openerp.define.next = 'summernote/module/Dialog';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/module/Dialog.js"></script>
+    <script>openerp.define.next = 'summernote/module/Handle';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/module/Handle.js"></script>
+    <script>openerp.define.next = 'summernote/module/Popover';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/module/Popover.js"></script>
+    <script>openerp.define.next = 'summernote/module/Toolbar';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/module/Toolbar.js"></script>
+
+    <script>openerp.define.next = 'summernote/Renderer';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/Renderer.js"></script>
+    <script>openerp.define.next = 'summernote/EventHandler';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/EventHandler.js"></script>
+
+    <script>openerp.define.next = 'summernote/settings';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/settings.js"></script>
+
+    <script>openerp.define.next = 'summernote/summernote';</script>
+    <script type="text/javascript" src="/website/static/lib/summernote/src/js/summernote.js"></script>
+    <script>openerp.define.next = 'summernote/openerp';</script>
+    <script type="text/javascript" src="/website/static/src/js/summernote.js"></script>
+    <script>openerp.define.desactive();</script>
+
+    <!--link rel="stylesheet" href="/website/static/lib/summernote/src/less/summernote.less"/-->
+    <link rel="stylesheet" href="/website/static/lib/summernote/summernote.css"/>
+</template>
+
+<template id="assets_common" inherit_id="web.assets_common" name="Website common assets">
+    <xpath expr='.' position="inside">
+        <t t-call="website.summernote"/>
+    </xpath>
+</template>
+
+<template id="assets_frontend" name="Website assets">
     <t t-call="website.theme"/>
 
     <script type="text/javascript" src="/website/static/src/js/website.js"></script>
@@ -16,18 +82,55 @@
     <link rel="stylesheet" href="/web/static/lib/select2/select2.css"/>
     <link rel="stylesheet" href="/website/static/lib/select2-bootstrap-css/select2-bootstrap.css"/>
     <script type="text/javascript" src="/web/static/lib/select2/select2.js"></script>
-    
+
 </template>
 
 <template id="assets_backend" name="website assets for backend" inherit_id="web.assets_backend">
     <xpath expr="." position="inside">
         <link rel="stylesheet" href="/website/static/src/css/website.backend.css"/>
-
         <script type="text/javascript" src="/website/static/src/js/website.backend.js"></script>
     </xpath>
 </template>
 
-<template id="website.submenu" name="Submenu">
+<template id="editor" name="Editor">
+    <link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
+    <link rel='stylesheet' href='/website/static/src/css/editor.css'/>
+    <link rel='stylesheet' href="/web/static/lib/jquery.ui/jquery-ui.css"/>
+    <script type="text/javascript" src="/website/static/lib/jQuery.transfo.js"></script>
+    <t t-call="web.jqueryui_conflict">
+        <script type="text/javascript" src="/web/static/lib/jquery.ui/jquery-ui.js"></script>
+    </t>
+    <script type="text/javascript" src='/website/static/lib/nearest/jquery.nearest.js'></script>
+
+    <!-- mutation observers shim backed by mutation events (8 < IE < 11, Safari < 6, FF < 14, Chrome < 17) -->
+    <script type="text/javascript" src="/website/static/lib/MutationObservers/test/sidetable.js"></script>
+    <script type="text/javascript" src="/website/static/lib/MutationObservers/MutationObserver.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/website.editor.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/website.snippets.editor.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/website.snippets.gallery.js" />
+</template>
+
+<template id="assets_editor" name="Editor assets">
+    <t t-call="website.editor"/>
+    <script type="text/javascript" src="/website/static/lib/ace/ace.js"></script>
+    <script type="text/javascript" src="/website/static/lib/ace/theme-monokai.js"></script>
+    <script type="text/javascript" src="/website/static/lib/ace/mode-xml.js"></script>
+    <script type="text/javascript" src="/website/static/lib/vkbeautify/vkbeautify.0.99.00.beta.js"></script>
+    <script type="text/javascript" src="/website/static/lib//jquery.mjs.nestedSortable/jquery.mjs.nestedSortable.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/website.contentMenu.js"></script> <!-- groups="base.group_website_designer" -->
+    <script type="text/javascript" src="/website/static/src/js/website.mobile.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/website.seo.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/website.tour.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/website.tour.banner.js"></script> <!-- groups="base.group_website_designer" -->
+    <script type="text/javascript" src="/website/static/src/js/website.tour.rte.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/website.ace.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/website.translator.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/website.theme.js"></script>
+</template>
+
+<!-- Layout -->
+
+<template id="submenu" name="Submenu">
     <li t-if="not submenu.child_id" t-att-class="
         ((submenu.url and submenu.url != '/' and request.httprequest.path.startswith(submenu.url)) or
          request.httprequest.path == submenu.url) and 'active'
@@ -161,6 +264,12 @@
     </html>
 </template>
 
+<template id="layout_editor" inherit_id="website.layout" name="Editor" groups="base.group_website_publisher,base.group_website_designer">
+    <xpath expr='//t[@t-call-assets="website.assets_frontend"][@t-css="false"]' position="after">
+        <t t-call-assets="website.assets_editor" async="True"/>
+    </xpath>
+</template>
+
 <template id="layout_footer_copyright" inherit_id="website.layout" name="Footer Copyright">
     <xpath expr="//div[contains(@id, 'footer')]" position="inside">
         <div class="container mt16 mb8">
@@ -183,113 +292,6 @@
     </xpath>
 </template>
 
-<template id="editor_head" inherit_id="website.layout" name="Editor" groups="base.group_website_publisher,base.group_website_designer">
-    <xpath expr='//t[@t-call-assets="website.assets_frontend"][@t-css="false"]' position="after">
-        <t t-call-assets="website.assets_editor" async="True"/>
-    </xpath>
-</template>
-
-<template id="summernote" name="Summernote">
-    <script type="text/javascript" src="/website/static/src/js/openerp.define.js"></script>
-    <script>openerp.define.active();</script>
-    <script>openerp.define.next = 'summernote/core/async';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/core/async.js"></script>
-    <script>openerp.define.next = 'summernote/core/func';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/core/func.js"></script>
-    <script>openerp.define.next = 'summernote/core/agent';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/core/agent.js"></script>
-    <script>openerp.define.next = 'summernote/core/list';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/core/list.js"></script>
-    <script>openerp.define.next = 'summernote/core/dom';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/core/dom.js"></script>
-    <script>openerp.define.next = 'summernote/core/key';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/core/key.js"></script>
-    <script>openerp.define.next = 'summernote/core/range';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/core/range.js"></script>
-
-    <script>openerp.define.next = 'summernote/editing/Bullet';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/editing/Bullet.js"></script>
-    <script>openerp.define.next = 'summernote/editing/History';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/editing/History.js"></script>
-    <script>openerp.define.next = 'summernote/editing/Style';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/editing/Style.js"></script>
-    <script>openerp.define.next = 'summernote/editing/Table';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/editing/Table.js"></script>
-    <script>openerp.define.next = 'summernote/editing/Typing';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/editing/Typing.js"></script>
-    <script>openerp.define.next = 'summernote/editing/Editor';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/editing/Editor.js"></script>
-
-    <script>openerp.define.next = 'summernote/module/Button';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/module/Button.js"></script>
-    <script>openerp.define.next = 'summernote/module/Dialog';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/module/Dialog.js"></script>
-    <script>openerp.define.next = 'summernote/module/Handle';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/module/Handle.js"></script>
-    <script>openerp.define.next = 'summernote/module/Popover';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/module/Popover.js"></script>
-    <script>openerp.define.next = 'summernote/module/Toolbar';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/module/Toolbar.js"></script>
-
-    <script>openerp.define.next = 'summernote/Renderer';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/Renderer.js"></script>
-    <script>openerp.define.next = 'summernote/EventHandler';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/EventHandler.js"></script>
-
-    <script>openerp.define.next = 'summernote/settings';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/settings.js"></script>
-
-    <script>openerp.define.next = 'summernote/summernote';</script>
-    <script type="text/javascript" src="/website/static/lib/summernote/src/js/summernote.js"></script>
-    <script>openerp.define.next = 'summernote/openerp';</script>
-    <script type="text/javascript" src="/website/static/src/js/summernote.js"></script>
-    <script>openerp.define.desactive();</script>
-
-    <!--link rel="stylesheet" href="/website/static/lib/summernote/src/less/summernote.less"/-->
-    <link rel="stylesheet" href="/website/static/lib/summernote/summernote.css"/>
-</template>
-<template id="editor" name="Editor">
-    <link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
-    <link rel='stylesheet' href='/website/static/src/css/editor.css'/>
-    <link rel='stylesheet' href="/web/static/lib/jquery.ui/jquery-ui.css"/>
-    <script type="text/javascript" src="/website/static/lib/jQuery.transfo.js"></script>
-    <t t-call="web.jqueryui_conflict">
-        <script type="text/javascript" src="/web/static/lib/jquery.ui/jquery-ui.js"></script>
-    </t>
-    <script type="text/javascript" src='/website/static/lib/nearest/jquery.nearest.js'></script>
-
-    <!-- mutation observers shim backed by mutation events (8 < IE < 11, Safari < 6, FF < 14, Chrome < 17) -->
-    <script type="text/javascript" src="/website/static/lib/MutationObservers/test/sidetable.js"></script>
-    <script type="text/javascript" src="/website/static/lib/MutationObservers/MutationObserver.js"></script>
-    <script type="text/javascript" src="/website/static/src/js/website.editor.js"></script>
-    <script type="text/javascript" src="/website/static/src/js/website.snippets.editor.js"></script>
-    <script type="text/javascript" src="/website/static/src/js/website.snippets.gallery.js" />
-</template>
-
-<template id="assets_common" inherit_id="web.assets_common" name="Website common assets">
-    <xpath expr='.' position="inside">
-        <t t-call="website.summernote"/>
-    </xpath>
-</template>
-
-<template id="assets_editor" name="Editor assets">
-    <t t-call="website.editor"/>
-    <script type="text/javascript" src="/website/static/lib/ace/ace.js"></script>
-    <script type="text/javascript" src="/website/static/lib/ace/theme-monokai.js"></script>
-    <script type="text/javascript" src="/website/static/lib/ace/mode-xml.js"></script>
-    <script type="text/javascript" src="/website/static/lib/vkbeautify/vkbeautify.0.99.00.beta.js"></script>
-    <script type="text/javascript" src="/website/static/lib//jquery.mjs.nestedSortable/jquery.mjs.nestedSortable.js"></script>
-    <script type="text/javascript" src="/website/static/src/js/website.contentMenu.js"></script> <!-- groups="base.group_website_designer" -->
-    <script type="text/javascript" src="/website/static/src/js/website.mobile.js"></script>
-    <script type="text/javascript" src="/website/static/src/js/website.seo.js"></script>
-    <script type="text/javascript" src="/website/static/src/js/website.tour.js"></script>
-    <script type="text/javascript" src="/website/static/src/js/website.tour.banner.js"></script> <!-- groups="base.group_website_designer" -->
-    <script type="text/javascript" src="/website/static/src/js/website.tour.rte.js"></script>
-    <script type="text/javascript" src="/website/static/src/js/website.ace.js"></script>
-    <script type="text/javascript" src="/website/static/src/js/website.translator.js"></script>
-    <script type="text/javascript" src="/website/static/src/js/website.theme.js"></script>
-</template>
-
 <template id="login_layout" inherit_id="web.login_layout" name="Website Login Layout">
     <xpath expr="t" position="replace">
         <t t-call="website.layout">
@@ -340,6 +342,28 @@
     </xpath>
 </template>
 
+<template id="language_selector">
+    <ul class="list-inline js_language_selector mt16" t-if="(request and request.website_multilang and len(languages) &gt; 1) or (website and editable)">
+        <li t-foreach="languages" t-as="lg">
+          <a
+            t-att-href="url_for(request.httprequest.path + '?' + keep_query(), lang=lg[0])"
+            t-att-data-default-lang="editable and 'true' if website and lg[0] == website.default_lang_code else None"
+            t-att-data-lang="lg[0]"
+            class="js_change_lang"
+          >
+            <t t-esc="lg[1].split('/').pop()"/>
+          </a>
+        </li>
+        <li groups="base.group_website_publisher">
+            <t t-set="url_return" t-value="url_for('', '[lang]') + '?' + keep_query()"/>
+            <a t-attf-href="/web#action=base.action_view_base_language_install&amp;website_id=#{website.id if website else ''}&amp;url_return=#{url_return}">
+                <i class="fa fa-plus-circle"/>
+                Add a language...
+            </a>
+        </li>
+    </ul>
+</template>
+
 <template id="footer_default" inherit_id="website.footer_custom" customize_show="True" name="Automatic Footer">
     <xpath expr="//div[@id='footer']" position="replace">
         <div id="footer" class="container hidden-print">
@@ -391,27 +415,7 @@
     </xpath>
 </template>
 
-<template id="language_selector">
-    <ul class="list-inline js_language_selector mt16" t-if="(request and request.website_multilang and len(languages) &gt; 1) or (website and editable)">
-        <li t-foreach="languages" t-as="lg">
-          <a
-            t-att-href="url_for(request.httprequest.path + '?' + keep_query(), lang=lg[0])"
-            t-att-data-default-lang="editable and 'true' if website and lg[0] == website.default_lang_code else None"
-            t-att-data-lang="lg[0]"
-            class="js_change_lang"
-          >
-            <t t-esc="lg[1].split('/').pop()"/>
-          </a>
-        </li>
-        <li groups="base.group_website_publisher">
-            <t t-set="url_return" t-value="url_for('', '[lang]') + '?' + keep_query()"/>
-            <a t-attf-href="/web#action=base.action_view_base_language_install&amp;website_id=#{website.id if website else ''}&amp;url_return=#{url_return}">
-                <i class="fa fa-plus-circle"/>
-                Add a language...
-            </a>
-        </li>
-    </ul>
-</template>
+<!-- Util template -->
 
 <template id="publish_management">
     <div groups="base.group_website_publisher" t-ignore="true" class="pull-right css_editable_mode_hidden" t-att-style="style or ''">
@@ -856,7 +860,6 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
 </sitemapindex>
 </template>
 
-
 <!-- Actual pages -->
 
 <template id="homepage" name="Homepage" page="True" priority="29">