diff --git a/wax-prosemirror-components/src/sideMenu/SideMenuBar.js b/wax-prosemirror-components/src/sideMenu/SideMenuBar.js
deleted file mode 100644
index 8686d7abd1bbacd98f57d53c65dc84e6158322c7..0000000000000000000000000000000000000000
--- a/wax-prosemirror-components/src/sideMenu/SideMenuBar.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import React from "react";
-import { forEach, map } from "lodash";
-import SideMenuItems from "./SideMenuItems";
-
-const filtered = (menu, menuItems) =>
-  Object.keys(menu)
-    .filter(key => menuItems.includes(key))
-    .reduce((obj, key) => {
-      obj[key] = menu[key];
-      return obj;
-    }, {});
-
-const setMenuItems = (menu, menuItems) => {
-  let items = menuItems;
-  if (menuItems.length === 0) {
-    forEach(menu, (key, index) => {
-      items.push(index);
-    });
-  }
-  return filtered(menu, items);
-};
-
-const SideMenuBar = ({
-  menuItems = [],
-  children,
-  state,
-  dispatch,
-  className,
-  fileUpload
-}) => (
-  <div className={`${className} side-menu-container`}>
-    <div className="side-menu-inner">
-      <div className="side-menu">
-        {
-          <span>
-            {map(setMenuItems(SideMenuItems, menuItems), item =>
-              item.menu({ state, dispatch, item, fileUpload })
-            )}
-          </span>
-        }
-      </div>
-    </div>
-  </div>
-);
-
-export default SideMenuBar;
diff --git a/wax-prosemirror-components/src/sideMenuBar/SideMenuItems.js b/wax-prosemirror-components/src/sideMenuBar/SideMenuItems.js
index 4ff711b2c6bd194aafcfa8f2ac27a2653c5d4342..a314ab23316efaa871957cd7cca0b04da2e4309b 100644
--- a/wax-prosemirror-components/src/sideMenuBar/SideMenuItems.js
+++ b/wax-prosemirror-components/src/sideMenuBar/SideMenuItems.js
@@ -18,10 +18,9 @@ export default {
     title: "Change to General Text",
     // content: icons.paragraph,
     content: "General Text",
-    active: state => {
-      return blockActive(state.config.schema.nodes.paragraph)(state);
+    enable: state => {
+      return setBlockType(state.config.schema.nodes.paragraph)(state);
     },
-    // enable: setBlockType(schema.nodes.paragraph),
     run(state, dispatch) {
       setBlockType(state.config.schema.nodes.paragraph)(state, dispatch);
     },
@@ -32,8 +31,8 @@ export default {
   subtitle: {
     title: "Change to Subtilte",
     content: "Subtilte",
-    active: state => {
-      return blockActive(state.config.schema.nodes.subtitle)(state);
+    enable: state => {
+      return setBlockType(state.config.schema.nodes.subtitle)(state);
     },
     run(state, dispatch) {
       setBlockType(state.config.schema.nodes.subtitle)(state, dispatch);
@@ -44,12 +43,11 @@ export default {
   heading1: {
     title: "Change to heading level 1",
     content: "Heading 1",
-    active: state => {
-      return blockActive(state.config.schema.nodes.heading, { level: 1 })(
+    enable: state => {
+      return setBlockType(state.config.schema.nodes.heading, { level: 1 })(
         state
       );
     },
-    // enable: setBlockType(schema.nodes.heading, { level: 1 }),
     run(state, dispatch) {
       setBlockType(state.config.schema.nodes.heading, { level: 1 })(
         state,
@@ -62,12 +60,11 @@ export default {
   heading2: {
     title: "Change to heading level 2",
     content: "Heading 2",
-    active: state => {
-      return blockActive(state.config.schema.nodes.heading, { level: 2 })(
+    enable: state => {
+      return setBlockType(state.config.schema.nodes.heading, { level: 2 })(
         state
       );
     },
-    // enable: setBlockType(schema.nodes.heading, { level: 2 }),
     run(state, dispatch) {
       setBlockType(state.config.schema.nodes.heading, { level: 2 })(
         state,
@@ -80,12 +77,11 @@ export default {
   heading3: {
     title: "Change to heading level 3",
     content: "Heading 3",
-    active: state => {
-      return blockActive(state.config.schema.nodes.heading, { level: 3 })(
+    enable: state => {
+      return setBlockType(state.config.schema.nodes.heading, { level: 3 })(
         state
       );
     },
-    // enable: setBlockType(schema.nodes.heading, { level: 3 }),
     run(state, dispatch) {
       setBlockType(state.config.schema.nodes.heading, { level: 3 })(
         state,
diff --git a/wax-prosemirror-schema/src/EditoriaSchema.js b/wax-prosemirror-schema/src/EditoriaSchema.js
index 356149bb3b857c4a14cf969b868abcc7ab7f5285..d0fdbb7cf6a0401860d465eb6dc7012f5ce7c343 100644
--- a/wax-prosemirror-schema/src/EditoriaSchema.js
+++ b/wax-prosemirror-schema/src/EditoriaSchema.js
@@ -58,7 +58,7 @@ const EditoriaSchema = {
       }
     },
     heading: {
-      attrs: { class: { default: "ct" }, level: { default: 1 } },
+      attrs: { level: { default: 1 } },
       content: "inline*",
       group: "block",
       defining: true,
@@ -71,11 +71,7 @@ const EditoriaSchema = {
         { tag: "h6", attrs: { level: 6 } }
       ],
       toDOM(node) {
-        if (node.attrs.level === 1) {
-          return ["h" + node.attrs.level, node.attrs, 0];
-        } else {
-          return ["h" + node.attrs.level, 0];
-        }
+        return ["h" + node.attrs.level, 0];
       }
     }
   },