diff --git a/website_cms/__openerp__.py b/website_cms/__openerp__.py
index 65423c9c..ee9aa4bd 100644
--- a/website_cms/__openerp__.py
+++ b/website_cms/__openerp__.py
@@ -30,6 +30,7 @@
         "views/cms_media.xml",
         "views/cms_media_category.xml",
         'views/website_menu.xml',
+        'views/res_config.xml',
         # templates
         "templates/assets.xml",
         "templates/misc.xml",
diff --git a/website_cms/models/__init__.py b/website_cms/models/__init__.py
index 37fc3adf..6d8f80dc 100644
--- a/website_cms/models/__init__.py
+++ b/website_cms/models/__init__.py
@@ -12,3 +12,4 @@
 from . import cms_page
 from . import cms_media
 from . import cms_tag
+from . import res_config
diff --git a/website_cms/models/res_config.py b/website_cms/models/res_config.py
new file mode 100644
index 00000000..2ea0b501
--- /dev/null
+++ b/website_cms/models/res_config.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from openerp import models, fields
+
+
+class WebsiteConfigSettings(models.TransientModel):
+    """Override website config model."""
+
+    _inherit = "website.config.settings"
+
+    filter_menu = fields.Selection(
+        string='Menu Filter',
+        related='website_id.filter_menu',
+        help='Filter to determine which menu shows in the front-end'
+    )
diff --git a/website_cms/models/website.py b/website_cms/models/website.py
index 7ab4e6c9..6622c189 100644
--- a/website_cms/models/website.py
+++ b/website_cms/models/website.py
@@ -6,6 +6,7 @@
 # from openerp import fields
 from openerp import api
 from openerp import tools
+from openerp import fields
 from openerp.addons.web.http import request
 from openerp.addons.website.models.website import unslug
 
@@ -20,6 +21,18 @@ class Website(models.Model):
 
     _inherit = "website"
 
+    filter_menu = fields.Selection(
+        string="Show Menu",
+        required=True,
+        selection=[
+            ('1', 'Odoo'),
+            ('2', 'CMS'),
+            ('3', 'Odoo & CMS'),
+        ],
+        default='1',
+        help="Filter to determine which menu shows in the front-end"
+    )
+
     @api.model
     @tools.ormcache('max_depth', 'pages', 'nav', 'type_ids', 'published')
     def get_nav_pages(self, max_depth=3, pages=None,
diff --git a/website_cms/templates/layout.xml b/website_cms/templates/layout.xml
index e3fafe55..ca7b4d7f 100644
--- a/website_cms/templates/layout.xml
+++ b/website_cms/templates/layout.xml
@@ -11,6 +11,19 @@
         <t t-call="website_cms.alternate_languages" />
     </xpath>
 
+    <xpath expr="//ul[@id='top_menu']/t[@t-foreach='website.menu_id.child_id']" position="replace">
+      <t t-if="website.filter_menu in ['1','3']">
+        <t t-foreach="website.menu_id.child_id" t-as="submenu">
+          <t t-call="website.submenu"/>
+        </t>
+      </t>
+      <t t-if="website.filter_menu in ['2','3']">
+        <t t-foreach="website.get_nav_pages()" t-as="submenu">
+          <t t-call="website_cms.submenu"/>
+        </t>
+      </t>
+    </xpath>
+
   </template>
 
   <template id="add_status_message" inherit_id="website.layout">
diff --git a/website_cms/templates/menu.xml b/website_cms/templates/menu.xml
index 5a4f3d53..87e67251 100644
--- a/website_cms/templates/menu.xml
+++ b/website_cms/templates/menu.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
+<odoo>
 
 <!-- User Navbar -->
 
@@ -42,7 +41,26 @@
 
 </template>
 
-</data>
-</openerp>
+<template id="submenu" name="Website CMS Submenu">
+    <t t-set="is_path" t-value="submenu.get('url') != '/' and request.httprequest.path == submenu.get('url')"/>
+    <t t-set="child_in_path" t-value="any([request.httprequest.path == child.get('url') for child in submenu.get('children', [])])"/>
+    <li t-if="not submenu.get('children')" t-att-class="'active' if is_path else None">
+        <a t-att-href="submenu.get('url')" t-ignore="true">
+            <span t-esc="submenu.get('name')"/>
+        </a>
+    </li>
+    <li t-if="submenu.get('children')" t-attf-class="dropdown #{(submenu.get('url') and submenu.get('url') != '/' and child_in_path or is_path) and 'active'}">
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+            <span t-esc="submenu.get('name')"/> <span class="caret" t-ignore="true"></span>
+        </a>
+        <ul class="dropdown-menu" role="menu">
+            <t t-foreach="submenu.get('children')" t-as="submenu">
+                <t t-call="website_cms.submenu"/>
+            </t>
+        </ul>
+    </li>
+</template>
+
+</odoo>
 
 
diff --git a/website_cms/views/res_config.xml b/website_cms/views/res_config.xml
new file mode 100644
index 00000000..b6740563
--- /dev/null
+++ b/website_cms/views/res_config.xml
@@ -0,0 +1,20 @@
+<openerp>
+  <data>
+
+    <record id="website_config_settings" model="ir.ui.view">
+      <field name="name">website settings form</field>
+      <field name="model">website.config.settings</field>
+      <field name="inherit_id" ref="website.view_website_config_settings"/>
+      <field name="arch" type="xml">
+
+        <xpath expr="//group[@name='advanced']" position="after">
+          <group string="CMS" name="website-cms">
+            <field name="filter_menu" />
+          </group>
+        </xpath>
+
+      </field>
+    </record>
+
+  </data>
+</openerp>