diff --git a/addons/website/static/src/js/website.contentMenu.js b/addons/website/static/src/js/website.contentMenu.js
index 3a9a5cbe3b9..70f35871e74 100644
--- a/addons/website/static/src/js/website.contentMenu.js
+++ b/addons/website/static/src/js/website.contentMenu.js
@@ -204,7 +204,8 @@ var EditMenuDialog = widget.Dialog.extend({
         this.flat = this.flatenize(menu);
         this.to_delete = [];
         this._super(parent, _.extend({}, {
-            title: _t("Edit Menu")
+            title: _t("Edit Menu"),
+            size: 'medium',
         }, options || {}));
     },
     start: function () {
@@ -332,6 +333,8 @@ var MenuEntryDialog = widget.LinkDialog.extend({
                 self.$('#o_link_dialog_url_input').closest('.form-group').toggle();
             });
         }
+        this.$modal.find('.modal-lg').removeClass('modal-lg')
+                   .find('.col-md-8').removeClass('col-md-8').addClass('col-xs-12');
 
         return this._super.apply(this, arguments);
     },
diff --git a/addons/website/static/src/less/website.ui.components.less b/addons/website/static/src/less/website.ui.components.less
index d437233e4e7..c5f7a793f11 100644
--- a/addons/website/static/src/less/website.ui.components.less
+++ b/addons/website/static/src/less/website.ui.components.less
@@ -221,6 +221,21 @@ body .modal {
         }
     }
 
+    // TOP MENU EDITOR
+    .oe_menu_editor {
+        ul {
+            padding-left: 37px;
+        }
+
+        li {
+            margin-top: -1px;
+
+            .input-group-addon {
+                border-radius: 0;
+            }
+        }
+    }
+
     // SEO CONFIGURATION
     &.oe_seo_configuration {
         #language-box {
diff --git a/addons/website/static/src/xml/website.contentMenu.xml b/addons/website/static/src/xml/website.contentMenu.xml
index fa822226b07..d7fa51e1ad8 100644
--- a/addons/website/static/src/xml/website.contentMenu.xml
+++ b/addons/website/static/src/xml/website.contentMenu.xml
@@ -40,15 +40,13 @@
             <t t-call="website.contentMenu.dialog.submenu"/>
         </t>
     </ul>
-    <div class="mt16">
-        <div class="pull-right text-muted">
+    <div class="mt32">
+        <small class="pull-right text-muted">
             Drag a menu to the right to create a sub-menu
-        </div>
-        <div>
-            <a href="#" class="js_add_menu">
-                <i class="fa fa-plus-circle"/> Add Menu Entry
-            </a>
-        </div>
+        </small>
+        <a href="#" class="js_add_menu">
+            <i class="fa fa-plus-circle"/> Add Menu Entry
+        </a>
     </div>
 </div>
 <t t-name="website.contentMenu.dialog.edit.link_menu_options">