diff --git a/wax-prosemirror-components/index.js b/wax-prosemirror-components/index.js
index 0160177faa0f6ffb4c99a921cf502cd6ca28d358..77f091a36a0c52414fcf36253d043173c30a5ba5 100644
--- a/wax-prosemirror-components/index.js
+++ b/wax-prosemirror-components/index.js
@@ -15,7 +15,6 @@ export { default as TrackChangeEnable } from './src/components/trackChanges/Trac
 export { default as CreateTable } from './src/components/tables/CreateTable';
 export { default as Tabs } from './src/ui/tabs/Tabs';
 export { default as BlockLevelTools } from './src/ui/tabs/BlockLevelTools';
-export { default as LeftSideButton } from './src/components/various/LeftSideButton';
 export { default as SpecialCharactersTool } from './src/components/specialCharacters/SpecialCharactersTool';
 export { default as TextHighlightingTool } from './src/components/textHighlight/TextHighlightingTool';
 export { default as EditorInfoTool } from './src/components/EditorInfo/CounterInfo/EditorInfoTool';
diff --git a/wax-prosemirror-core/index.js b/wax-prosemirror-core/index.js
index 68eb331d6a90d0b5a2e2a7bfe845360be62ab573..6621ca77845ec3b7988ca7c6f0f680b438f28980 100644
--- a/wax-prosemirror-core/index.js
+++ b/wax-prosemirror-core/index.js
@@ -34,3 +34,4 @@ export { default as trackedTransaction } from './src/utilities/track-changes/tra
 /* Components */
 
 export { default as LeftMenuTitle } from './src/components/LeftMenuTitle';
+export { default as LeftSideButton } from './src/components/LeftSideButton';
diff --git a/wax-prosemirror-components/src/components/various/LeftSideButton.js b/wax-prosemirror-core/src/components/LeftSideButton.js
similarity index 85%
rename from wax-prosemirror-components/src/components/various/LeftSideButton.js
rename to wax-prosemirror-core/src/components/LeftSideButton.js
index c0765e61775c7b13901cf05e05706ea7b4073add..81b044af41729a55f9d206face3aead77941869a 100644
--- a/wax-prosemirror-components/src/components/various/LeftSideButton.js
+++ b/wax-prosemirror-core/src/components/LeftSideButton.js
@@ -1,9 +1,8 @@
 /* eslint react/prop-types: 0 */
 import React, { useContext, useMemo } from 'react';
-import { WaxContext } from 'wax-prosemirror-core';
 import styled, { css } from 'styled-components';
-import { th, override } from '@pubsweet/ui-toolkit';
-import MenuButton from '../../ui/buttons/MenuButton';
+import { WaxContext } from '../WaxContext';
+import { MenuButton } from 'wax-prosemirror-components';
 
 const activeStyles = css`
   pointer-events: none;
@@ -28,7 +27,7 @@ const LeftSideButton = ({ view = {}, item }) => {
 
   const { dispatch, state } = view;
 
-  const handleMouseDown = (e, editorState, editorDispatch) => {
+  const handleMouseDown = (e, editorState) => {
     e.preventDefault();
     run(editorState, dispatch);
   };
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/Author.js b/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/Author.js
index 70078ec34a7310f33c2073ae0103d1b7222390b9..7351a46f148ef495fa79c89d6465fefc4df4b030 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/Author.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/Author.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import { injectable } from 'inversify';
 import { isEmpty } from 'lodash';
-import { LeftSideButton } from 'wax-prosemirror-components';
-import { Tools, Commands } from 'wax-prosemirror-core';
+import { Tools, Commands, LeftSideButton } from 'wax-prosemirror-core';
 
 @injectable()
 class Author extends Tools {
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetry.js b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetry.js
index 2203d2c05f056cc77d64a5311d0849b7f5f7738e..5250b1d1967117387fd608b40171b88c39870ea4 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetry.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetry.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import { injectable } from 'inversify';
 import { isEmpty } from 'lodash';
-import { LeftSideButton } from 'wax-prosemirror-components';
-import { Tools, Commands } from 'wax-prosemirror-core';
+import { Tools, Commands, LeftSideButton } from 'wax-prosemirror-core';
 
 @injectable()
 class EpigraphPoetry extends Tools {
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProse.js b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProse.js
index 9a87cf74680faa9ebde2857a83a763ef9ec6d94b..d99932e6627d6513049d592c9370866ee238905c 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProse.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProse.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import { injectable } from 'inversify';
 import { isEmpty } from 'lodash';
-import { LeftSideButton } from 'wax-prosemirror-components';
-import { Tools, Commands } from 'wax-prosemirror-core';
+import { Tools, Commands, LeftSideButton } from 'wax-prosemirror-core';
 
 @injectable()
 export default class EpigraphProse extends Tools {
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js
index 4dfa3f8917be6f06ff986165f31fb6f13f26dc1d..63634f18a3dc2fbecbea2bfd4749b7fdf41d26ae 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import { injectable } from 'inversify';
 import { isEmpty } from 'lodash';
-import { LeftSideButton } from 'wax-prosemirror-components';
-import { Commands, Tools } from 'wax-prosemirror-core';
+import { Tools, Commands, LeftSideButton } from 'wax-prosemirror-core';
 import checkLevelFromConfig from './checkLevelFromConfig';
 
 @injectable()
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js
index c31b3e7ea926c19660915f6e7c0ec6a850fc7f8f..189a6a0b42916f56b48dba3bbe747be73c4a3eca 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import { injectable } from 'inversify';
 import { isEmpty } from 'lodash';
-import { LeftSideButton } from 'wax-prosemirror-components';
-import { Commands, Tools } from 'wax-prosemirror-core';
+import { Tools, Commands, LeftSideButton } from 'wax-prosemirror-core';
 import checkLevelFromConfig from './checkLevelFromConfig';
 
 @injectable()
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading4.js b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading4.js
index 0db2b1567403076fb97f7354ca31fa85247c7064..7c9e753cac6e89d3078c50d3e3115e86818cb12c 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading4.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading4.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import { injectable } from 'inversify';
 import { isEmpty } from 'lodash';
-import { LeftSideButton } from 'wax-prosemirror-components';
-import { Commands, Tools } from 'wax-prosemirror-core';
+import { Tools, Commands, LeftSideButton } from 'wax-prosemirror-core';
 import checkLevelFromConfig from './checkLevelFromConfig';
 
 @injectable()
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading5.js b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading5.js
index b9647b2570229cb906d7270fa684b109b69c9cb1..1e9f6b57a00f05612834c4978f3db24f3c1d4e39 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading5.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading5.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import { injectable } from 'inversify';
 import { isEmpty } from 'lodash';
-import { LeftSideButton } from 'wax-prosemirror-components';
-import { Commands, Tools } from 'wax-prosemirror-core';
+import { Tools, Commands, LeftSideButton } from 'wax-prosemirror-core';
 import checkLevelFromConfig from './checkLevelFromConfig';
 
 @injectable()
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading6.js b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading6.js
index 131f3a21b5a6f2345244e772733cfbb901d80600..51167521f7d2e3b409a9ab7aca2e599c93cdadd7 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading6.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading6.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import { injectable } from 'inversify';
 import { isEmpty } from 'lodash';
-import { LeftSideButton } from 'wax-prosemirror-components';
-import { Commands, Tools } from 'wax-prosemirror-core';
+import { Tools, Commands, LeftSideButton } from 'wax-prosemirror-core';
 
 @injectable()
 export default class Heading2 extends Tools {
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js b/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js
index 80c28f9d1e92529fca0c4e9ea1cfd566440e2409..408de02dbf4f23d92206d20b14827f0014c9e3bc 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import { injectable } from 'inversify';
 import { isEmpty } from 'lodash';
-import { LeftSideButton } from 'wax-prosemirror-components';
-import { Commands, Tools } from 'wax-prosemirror-core';
+import { Tools, Commands, LeftSideButton } from 'wax-prosemirror-core';
 
 @injectable()
 export default class SubTitle extends Tools {
diff --git a/wax-prosemirror-services/src/TextBlockLevel/BlockQuoteService/BlockQuote.js b/wax-prosemirror-services/src/TextBlockLevel/BlockQuoteService/BlockQuote.js
index a8cf32cc0864ef1e2773ff4f86d66edb7ecf6d3a..f8744d10f35a53ac39f08798030e8f3e587f31cd 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/BlockQuoteService/BlockQuote.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/BlockQuoteService/BlockQuote.js
@@ -3,8 +3,7 @@ import { injectable } from 'inversify';
 import { isEmpty } from 'lodash';
 import { wrapIn } from 'prosemirror-commands';
 import { NodeSelection } from 'prosemirror-state';
-import { LeftSideButton } from 'wax-prosemirror-components';
-import { Tools } from 'wax-prosemirror-core';
+import { Tools, LeftSideButton } from 'wax-prosemirror-core';
 
 @injectable()
 class BlockQuote extends Tools {
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetry.js b/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetry.js
index c163d52f5e8678a4342c1332e7bf27e03ba5a2e9..59b37c8e8934581e578844a713667f4249079fe5 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetry.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetry.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import { injectable } from 'inversify';
 import { isEmpty } from 'lodash';
-import { LeftSideButton } from 'wax-prosemirror-components';
-import { Commands, Tools } from 'wax-prosemirror-core';
+import { Tools, Commands, LeftSideButton } from 'wax-prosemirror-core';
 
 @injectable()
 class ExtractPoetry extends Tools {
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProse.js b/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProse.js
index ff31a3d40e188d333dad8ca2f4ee0513674ad4cf..ef2186bc7b42555b411b35a495dab3533354dc0c 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProse.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProse.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import { injectable } from 'inversify';
 import { isEmpty } from 'lodash';
-import { LeftSideButton } from 'wax-prosemirror-components';
-import { Commands, Tools } from 'wax-prosemirror-core';
+import { Tools, Commands, LeftSideButton } from 'wax-prosemirror-core';
 
 @injectable()
 class ExtractProse extends Tools {
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinued.js b/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinued.js
index f5e6e86cf18032123aaf8a2975f612ee062e1819..928fc7c907c50ea749e12bf93bceeee79022ba48 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinued.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinued.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import { injectable } from 'inversify';
 import { isEmpty } from 'lodash';
-import { LeftSideButton } from 'wax-prosemirror-components';
-import { Commands, Tools } from 'wax-prosemirror-core';
+import { Tools, Commands, LeftSideButton } from 'wax-prosemirror-core';
 
 @injectable()
 class ParagraphContinued extends Tools {
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/Paragraph.js b/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/Paragraph.js
index e61117393ef3f18aa10ffa415ba16dce6aca6527..45f652282bf953a1039fb14b62911d9327723da7 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/Paragraph.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/Paragraph.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import { injectable } from 'inversify';
 import { isEmpty } from 'lodash';
-import { LeftSideButton } from 'wax-prosemirror-components';
-import { Commands, Tools } from 'wax-prosemirror-core';
+import { Tools, Commands, LeftSideButton } from 'wax-prosemirror-core';
 
 @injectable()
 export default class Paragraph extends Tools {
diff --git a/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNote.js b/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNote.js
index 2b171d69ef8b19927c08411bcfd3450607a87fc3..d261b4c27545d091e4df5576277ad64330d9af47 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNote.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNote.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import { injectable } from 'inversify';
 import { isEmpty } from 'lodash';
-import { LeftSideButton } from 'wax-prosemirror-components';
-import { Commands, Tools } from 'wax-prosemirror-core';
+import { Tools, Commands, LeftSideButton } from 'wax-prosemirror-core';
 
 @injectable()
 class SourceNote extends Tools {