--- a/mouchak/static/js/editor.js
+++ b/mouchak/static/js/editor.js
@@ -165,9 +165,9 @@
     showContent: function(event) {
       var idx = $(event.target).closest('.content-item').attr('id').
         split('-')[1];
-      this.edit = {on: true, idx: idx};
       var content = this.model.get('content')[idx];
       content = new M.types.model[content.type](content);
+      this.editing = true;
       var contentview = new ContentView({model: content});
       contentview.render();
       M.editor.contentview = contentview;
@@ -365,6 +365,7 @@
       this.$menuOrder = $('#menu-order-wrap');
 
       if(this.model.get('customMenu') === true) {
+        this.$menuOrder.hide();
         $('#custom-menu').attr('checked', true);
         this.$menuOptions.show({complete: function() {
           //M.editor.wysiwig('#menu');


@@ -398,17 +399,15 @@
       var success_template = _.template($('#success-notif').html());
       var fail_template = _.template($('#fail-notif').html());
 
-      var bool, html = '', menuOrder = [];
-      if($('#custom-menu').is(":checked")) {
-        bool = true;
-        html = $('#menu').val().trim();
+      if($('#custom-menu').is(':checked')) {
+        var html = $('#menu').val().trim() || '';
+        this.model.set({'customMenu': true, 'html': html});
       }
       else {
-        bool = false;
-        menuOrder = $('#menu-order').val().split(',');
+        var menuOrder = $('#menu-order').val().split(',') || [];
+        this.model.set({'customMenu': false, 'menuOrder': menuOrder});
       }
-      this.model.set({'customMenu': bool, 'html': html, 'menuOrder': menuOrder});
-      //console.log(this.model.toJSON());
+      //console.log('menu model: ', this.model.toJSON());
       this.model.save({}, {
         success: function(model, response) {
           //console.log(model, response);
--- a/mouchak/templates/editor.html
+++ b/mouchak/templates/editor.html
@@ -54,19 +54,20 @@
       <div class="page">
         <div class="menu-config">
           <h4> Menu Config </h4>
+
+          <div class="control-group" id="menu-order-wrap">
+            <div class="input-prepend">
+              <span class="add-on"> <strong> Menu Order</strong></span>
+              <input id="menu-order" type="text" class="span4"
+              placeholder="list,page,names,for,menu,order" value="<%= menu_order %>">
+            </div>
+          </div>
+
           <div class="control-group">
             <input id="custom-menu" type="checkbox">
             <span class=""><strong> Custom Menu </strong></span>
           </div>
-          <div class="control-group" id="menu-order-wrap">
-            <% if(!$('#custom-menu').is(':checked')) { %>
-              <div class="input-prepend">
-                <span class="add-on"> <strong> Menu Order</strong></span>
-                <input id="menu-order" type="text" class="span4"
-                placeholder="list,page,names,for,menu,order" value="<%= menu_order %>">
-              </div>
-              <% } %>
-          </div>
+
           <div class="menu-options" style="display: none;">
             <div class="control-group">
               <div class="input-prepend">
@@ -78,6 +79,7 @@
             <label><strong> HTML for menu: </strong></label>
             <textarea cols="25" rows="8" id="menu"><%= menu %></textarea>
           </div>
+
         </div>
         <button id="updateMenu" class="btn btn-primary pull-right"> Update </button>
         <div class="clearfix"></div>