diff --git a/editors/editoria/src/Editoria.js b/editors/editoria/src/Editoria.js
index 33d5439b3c08ea3e9dfe0925cef274c90a71b700..9696eab0bc56e32a63dbcda459785661b651f3c7 100644
--- a/editors/editoria/src/Editoria.js
+++ b/editors/editoria/src/Editoria.js
@@ -10,8 +10,8 @@ import { demo } from './demo';
 const GlobalStyle = createGlobalStyle`
   body {
     margin: 0;
-    padding: 0;
     overflow-y: hidden;
+    padding: 0;
   }
 
   #root {
diff --git a/editors/editoria/src/layout/EditoriaLayout.js b/editors/editoria/src/layout/EditoriaLayout.js
index f64c6cce56179ab8cd77d4dfe6f0a59168d50000..ae7008ab4e8e7d27c029c7fd8bf7dddcfca5c35f 100644
--- a/editors/editoria/src/layout/EditoriaLayout.js
+++ b/editors/editoria/src/layout/EditoriaLayout.js
@@ -248,7 +248,7 @@ const EditoriaLayout = ({ editor }) => {
 
   return (
     <ThemeProvider theme={cokoTheme}>
-      <Wrapper style={fullScreenStyles}>
+      <Wrapper style={fullScreenStyles} id="wax-container">
         <TopMenu>
           <MainMenuToolBar />
         </TopMenu>
diff --git a/wax-prosemirror-components/package.json b/wax-prosemirror-components/package.json
index b6db997b205c7767557fc1e65225cf293272da70..f4812f94a8393aaafa1ccf6f4d95c3c486f9dadf 100644
--- a/wax-prosemirror-components/package.json
+++ b/wax-prosemirror-components/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.35",
   "description": "Wax prosemirror UI components",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "index.js",
   "files": [
     "dist"
   ],
diff --git a/wax-prosemirror-components/src/components/findAndReplace/ExandedFindAndReplaceComponent.js b/wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js
similarity index 96%
rename from wax-prosemirror-components/src/components/findAndReplace/ExandedFindAndReplaceComponent.js
rename to wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js
index 3455807ed1796b6931d00b7c8156286145e68842..6c499c69be0534b6e7d79a46f65499cdabf67d84 100644
--- a/wax-prosemirror-components/src/components/findAndReplace/ExandedFindAndReplaceComponent.js
+++ b/wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js
@@ -8,6 +8,7 @@ import React, {
 } from 'react';
 import { each, eachRight, debounce } from 'lodash';
 import { WaxContext } from 'wax-prosemirror-core';
+import { DocumentHelpers } from 'wax-prosemirror-utilities';
 import styled from 'styled-components';
 import { grid, th } from '@pubsweet/ui-toolkit';
 import Icon from '../../helpers/Icon';
@@ -137,7 +138,7 @@ const PreviousNextButton = styled.span`
   }
 `;
 
-const ExandedFindAndReplaceComponent = ({
+const ExpandedFindAndReplaceComponent = ({
   close,
   findNextMatch,
   findPreviousMatch,
@@ -255,7 +256,10 @@ const ExandedFindAndReplaceComponent = ({
 
   const replaceAll = () => {
     each(view, (singleView, viewId) => {
-      const results = helpers.findMatches(singleView.state.doc, searchValue);
+      const results = DocumentHelpers.findMatches(
+        singleView.state.doc,
+        searchValue,
+      );
       const {
         state: { tr },
       } = singleView;
@@ -340,4 +344,4 @@ const ExandedFindAndReplaceComponent = ({
   );
 };
 
-export default ExandedFindAndReplaceComponent;
+export default ExpandedFindAndReplaceComponent;
diff --git a/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceComponent.js b/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceComponent.js
index 25a981d5f1e5b9510ff9e6f8d8dfb26b5512b995..c18dd56ce8d970e8cbca705660f04e96132f6925 100644
--- a/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceComponent.js
+++ b/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceComponent.js
@@ -3,7 +3,7 @@ import React, { useState, useContext, useEffect } from 'react';
 import { TextSelection } from 'prosemirror-state';
 import { WaxContext } from 'wax-prosemirror-core';
 import FindComponent from './FindComponent';
-import ExandedFindAndReplaceComponent from './ExandedFindAndReplaceComponent';
+import ExpandedFindAndReplaceComponent from './ExpandedFindAndReplaceComponent';
 import helpers from './helpers';
 
 let lastActiveViewId;
@@ -228,7 +228,7 @@ const FindAndReplaceComponent = ({ close }) => {
   };
 
   return isExpanded ? (
-    <ExandedFindAndReplaceComponent
+    <ExpandedFindAndReplaceComponent
       close={close}
       findNextMatch={findNextMatch}
       findPreviousMatch={findPreviousMatch}
diff --git a/wax-prosemirror-components/src/components/rightArea/RightArea.js b/wax-prosemirror-components/src/components/rightArea/RightArea.js
index b4c21bdaa201e8ad92c5487de009d7899d3be2d3..9fcbe9529f6c8c6bcc98752b9192aed0c2dab82f 100644
--- a/wax-prosemirror-components/src/components/rightArea/RightArea.js
+++ b/wax-prosemirror-components/src/components/rightArea/RightArea.js
@@ -58,15 +58,24 @@ export default ({ area }) => {
           annotationTop =
             markNodeEl.getBoundingClientRect().top - WaxSurface.top;
       } else {
+        // Notes
         panelWrapper = document.getElementsByClassName('panelWrapper');
         panelWrapperHeight = panelWrapper[0].getBoundingClientRect().height;
 
         markNodeEl = document
           .querySelector('#notes-container')
           .querySelector(`[data-id="${id}"]`);
-        if (markNodeEl)
+        if (markNodeEl) {
+          const WaxContainerTop = document
+            .querySelector('#wax-container')
+            .getBoundingClientRect().top;
+
           annotationTop =
-            markNodeEl.getBoundingClientRect().top - panelWrapperHeight - 50;
+            markNodeEl.getBoundingClientRect().top -
+            panelWrapperHeight -
+            WaxContainerTop -
+            50;
+        }
       }
 
       let boxEl = null;
diff --git a/wax-prosemirror-components/src/components/trackChanges/TrackChangeOptionsComponent.js b/wax-prosemirror-components/src/components/trackChanges/TrackChangeOptionsComponent.js
index 7f4a06f437fc1db058fa9b2714544a3e0406982d..f9e8748d0238219cb9fca2b53724c97a98a2fabb 100644
--- a/wax-prosemirror-components/src/components/trackChanges/TrackChangeOptionsComponent.js
+++ b/wax-prosemirror-components/src/components/trackChanges/TrackChangeOptionsComponent.js
@@ -32,6 +32,8 @@ const TotalComments = styled.div`
 
 const ShowComments = styled.div`
   color: #bdc2ca;
+  display: flex;
+  flex-direction: row;
   height: 23px;
   padding-top: ${grid(2)};
 
@@ -40,7 +42,6 @@ const ShowComments = styled.div`
     cursor: not-allowed;
     fill: #85adff;
     height: 45px !important;
-    left: 62px;
     opacity: 0.6;
     position: relative;
     width: 45px !important;
@@ -58,7 +59,7 @@ const StyledIcon = styled(Icon)``;
 
 const StyledIconExpand = styled(Icon)`
   bottom: 3px;
-  left: 47px;
+  margin-left: auto;
   position: relative;
 `;
 
@@ -87,6 +88,8 @@ const AcceptRejectAllButton = styled.div`
   background: none;
   border: none;
   cursor: pointer;
+  display: flex;
+  flex-direction: row;
   padding-bottom: 3px;
   padding-top: 8px;
   text-align: start;
@@ -106,7 +109,7 @@ const AcceptRejectAllControls = styled.div`
   font-size: 14px;
   padding: ${grid(2)};
   position: absolute;
-  right: 207px;
+  right: 190px;
   transform-origin: 50% 50% 0px;
   width: 209px;
   z-index: 9999;
@@ -248,7 +251,7 @@ const TrackChangeOptionsComponent = ({
       >
         <AcceptRejectAllButton>
           <StyledIcon name="acceptRejectTrack" />
-          Accept/Reject All
+          <span>Accept/Reject All</span>
           <StyledIconExpand name="navigateNext" />
         </AcceptRejectAllButton>
         {isShownTrack && (
@@ -266,7 +269,7 @@ const TrackChangeOptionsComponent = ({
       </AcceptRejectAll>
       <TotalComments>{comments} COMMENTS</TotalComments>
       <ShowComments>
-        Show comments
+        <span>Show comments</span>
         <StyledToggleOn name="toggleOn" />
       </ShowComments>
     </Wrapper>
diff --git a/wax-prosemirror-core/package.json b/wax-prosemirror-core/package.json
index 3b760162753663a0c1ce908f5217e595c416806f..e0ae5ba91659fc25e619d426b4c60a490976baec 100644
--- a/wax-prosemirror-core/package.json
+++ b/wax-prosemirror-core/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.35",
   "description": "Wax prosemirror core",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "index.js",
   "files": [
     "dist"
   ],
diff --git a/wax-prosemirror-plugins/package.json b/wax-prosemirror-plugins/package.json
index 2e69e97dd621945d3ea5e7f04a2a4269ceb3a9e1..d3099ef3b2513f9bbc700df16a30f78a377ce0d0 100644
--- a/wax-prosemirror-plugins/package.json
+++ b/wax-prosemirror-plugins/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.35",
   "description": "Wax prosemirror plugins",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "index.js",
   "files": [
     "dist"
   ],
diff --git a/wax-prosemirror-schema/package.json b/wax-prosemirror-schema/package.json
index 9a3dd840c10520f799837af778cd4a968413f7a6..3f66cfc6ca3a061ff300fccc77968ed4494ce6cd 100644
--- a/wax-prosemirror-schema/package.json
+++ b/wax-prosemirror-schema/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.35",
   "description": "Wax prosemirror schema",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "index.js",
   "files": [
     "dist"
   ],
diff --git a/wax-prosemirror-services/package.json b/wax-prosemirror-services/package.json
index 1205226a04123a3c0e9c54ca993f17f2f559b8f4..b98457d803cecb9ac0085d0fce8b93930cb45140 100644
--- a/wax-prosemirror-services/package.json
+++ b/wax-prosemirror-services/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.35",
   "description": "Wax prosemirror services",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "index.js",
   "files": [
     "dist"
   ],
diff --git a/wax-prosemirror-utilities/package.json b/wax-prosemirror-utilities/package.json
index 9b077375875fb72b88b0f8e70ddd04f54dc1665a..8ff8c2f17aa1fcf02816827fce369a13e5174084 100644
--- a/wax-prosemirror-utilities/package.json
+++ b/wax-prosemirror-utilities/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.35",
   "description": "Wax prosemirror utilities",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "index.js",
   "files": [
     "dist"
   ],