diff --git a/wax-prosemirror-components/src/components/TableDropDown.js b/wax-prosemirror-components/src/components/TableDropDown.js
index 1ba857c982fe95584083d37523ebc151ff4ea5a0..4b14c5a634534a41b777195666f8a8b69b475b67 100644
--- a/wax-prosemirror-components/src/components/TableDropDown.js
+++ b/wax-prosemirror-components/src/components/TableDropDown.js
@@ -5,10 +5,16 @@ import Dropdown from "react-dropdown";
 import "react-dropdown/style.css";
 
 const DropdownStyled = styled(Dropdown)`
-  display: ${props => (props.select ? "inline-flex" : "none")};
+  display: inline-flex;
+  cursor: not-allowed;
+  opacity: ${props => (props.select ? 1 : 0.4)};
+  pointer-events: ${props => (props.select ? "default" : "none")};
   .Dropdown-control {
     border: none;
   }
+  .Dropdown-arrow {
+    top: 21px;
+  }
 `;
 
 const dropDownOptions = [
diff --git a/wax-prosemirror-components/src/components/button/Button.js b/wax-prosemirror-components/src/components/button/Button.js
index c127c6001a83d431a12eb42e239aa1a5c8693c02..4124ec070b88dfd5188f2a09654f5914410f0962 100644
--- a/wax-prosemirror-components/src/components/button/Button.js
+++ b/wax-prosemirror-components/src/components/button/Button.js
@@ -4,7 +4,8 @@ import classnames from "classnames";
 import classes from "./Button.module.css";
 
 const ButtonStyled = styled.button`
-  display: ${props => (props.select ? "inline" : "none")};
+  opacity: ${props => (props.select ? 1 : 0.4)};
+  pointer-events: ${props => (props.select ? "default" : "none")};
 `;
 
 const Button = ({ dispatch, state, item }) => (
diff --git a/wax-prosemirror-components/src/mainMenuBar/MainMenuBarItems.js b/wax-prosemirror-components/src/mainMenuBar/MainMenuBarItems.js
index 7c0445ed3e9abd665b0c2978039861a2df16e009..24d737fb0f7abef377737d3502a6e2e3c6f46805 100644
--- a/wax-prosemirror-components/src/mainMenuBar/MainMenuBarItems.js
+++ b/wax-prosemirror-components/src/mainMenuBar/MainMenuBarItems.js
@@ -118,19 +118,6 @@ export default {
     select: state => true,
     menu: props => <Button key={uuid()} {...props} />
   },
-  source: {
-    title: "Toggle Source",
-    content: icons.source,
-    active: state => {
-      return markActive(state.config.schema.marks.source)(state);
-    },
-    run(state, dispatch) {
-      toggleMark(state.config.schema.marks.source)(state, dispatch);
-    },
-
-    select: state => true,
-    menu: props => <Button key={uuid()} {...props} />
-  },
   small_caps: {
     title: "Toggle Small Caps",
     content: icons.small_caps,
@@ -214,18 +201,6 @@ export default {
     select: state => true,
     menu: props => <Button key={uuid()} {...props} />
   },
-  codeBlock: {
-    title: "Change to code block",
-    content: icons.code_block,
-    // active: blockActive(schema.nodes.code_block),
-    // enable: setBlockType(schema.nodes.code_block),
-    run(state, dispatch) {
-      wrapIn(state.config.schema.nodes.codeBlock)(state, dispatch);
-    },
-
-    select: state => true,
-    menu: props => <Button key={uuid()} {...props} />
-  },
   blockquote: {
     title: "Wrap in block quote",
     content: icons.blockquote,
@@ -283,5 +258,39 @@ export default {
     select: state => true,
     run: option => true,
     menu: props => <ImageUpload key={uuid()} {...props} />
+  },
+  table: {
+    title: "Insert table",
+    content: icons.table,
+    // enable: canInsert(schema.nodes.table),
+    run: (state, dispatch) => {
+      // const { from } = state.selection
+      let rowCount = window && window.prompt("How many rows?", 2);
+      let colCount = window && window.prompt("How many columns?", 2);
+
+      const cells = [];
+      while (colCount--) {
+        cells.push(state.config.schema.nodes.table_cell.createAndFill());
+      }
+
+      const rows = [];
+      while (rowCount--) {
+        rows.push(
+          state.config.schema.nodes.table_row.createAndFill(null, cells)
+        );
+      }
+
+      const table = state.config.schema.nodes.table.createAndFill(null, rows);
+      dispatch(state.tr.replaceSelectionWith(table));
+    },
+    select: state => true,
+    menu: props => <Button key={uuid()} {...props} />
+  },
+  tableDropDownOptions: {
+    content: "table",
+    run: option => true,
+    title: "Select Options",
+    select: state => addColumnBefore(state),
+    menu: props => <TableDropDown key={uuid()} {...props} />
   }
 };
diff --git a/wax-prosemirror-layouts/layouts/editoria-layout.css b/wax-prosemirror-layouts/layouts/editoria-layout.css
index 1e725452dc8a6fc626577f196f3512b1b62b673a..7a2dccb96f3e27cf9109b653a604aff9522d891b 100644
--- a/wax-prosemirror-layouts/layouts/editoria-layout.css
+++ b/wax-prosemirror-layouts/layouts/editoria-layout.css
@@ -26,7 +26,7 @@
   background: #fff;
   /*box-shadow: 0 1px 3px rgba(0, 0, 0, 0.26);*/
   /*box-sizing: border-box;*/
-  overflow: hidden;
+  /*overflow: hidden;*/
   padding: 2px 2px 2px 0;
   position: relative;
 }
diff --git a/wax-prosemirror-themes/themes/editoria-theme.css b/wax-prosemirror-themes/themes/editoria-theme.css
index 28da8b547698ddf8940c28fb50c6133ed806e833..95b4476841cfc91830dac6ccf2258fa3ae0f9ce1 100644
--- a/wax-prosemirror-themes/themes/editoria-theme.css
+++ b/wax-prosemirror-themes/themes/editoria-theme.css
@@ -42,7 +42,7 @@
 .wax-t-editoria table {
   border-spacing: 0px;
   table-layout: fixed;
-  width: 100%;
+  width: 50%;
   overflow: hidden;
 }