diff --git a/wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js b/wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js
index b805180f683f85255679db192bf5d7c5bfff2db6..347e79156c7b792449f6dd4eb3ba6dfca711fffa 100644
--- a/wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js
+++ b/wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js
@@ -4,6 +4,7 @@ import { TextSelection } from 'prosemirror-state';
 import { last, maxBy } from 'lodash';
 import styled from 'styled-components';
 import { WaxContext, DocumentHelpers } from 'wax-prosemirror-core';
+import { v4 as uuidv4 } from 'uuid';
 import CommentBox from './ui/comments/CommentBox';
 
 const ConnectedCommentStyled = styled.div`
@@ -73,15 +74,24 @@ export default ({ comment, top, commentId, recalculateTops }) => {
     };
 
     comment.attrs.conversation.push(obj);
-
+    const id = uuidv4();
     allCommentsWithSameId.forEach(singleComment => {
-      dispatch(
-        tr
+      activeView.dispatch(
+        activeView.state.tr.removeMark(
+          singleComment.pos,
+          singleComment.pos + singleComment.node.nodeSize,
+          commentMark,
+        ),
+      );
+      activeView.dispatch(
+        activeView.state.tr
           .addMark(
             singleComment.pos,
-            singleComment.pos + singleComment.nodeSize,
+            singleComment.pos + singleComment.node.nodeSize,
             commentMark.create({
-              ...((comment && comment.attrs) || {}),
+              id,
+              group: comment.attrs.group,
+              viewid: comment.attrs.viewid,
               conversation: comment.attrs.conversation,
             }),
           )
diff --git a/wax-prosemirror-services/src/FindAndReplaceService/components/FindAndReplaceTool.js b/wax-prosemirror-services/src/FindAndReplaceService/components/FindAndReplaceTool.js
index 194ea9d6272ae6dd6dd9970d13ae35f45240c606..b8a8603c5c1b88d683ca8eba1393765fcdebf8f9 100644
--- a/wax-prosemirror-services/src/FindAndReplaceService/components/FindAndReplaceTool.js
+++ b/wax-prosemirror-services/src/FindAndReplaceService/components/FindAndReplaceTool.js
@@ -8,7 +8,7 @@ import React, {
 } from 'react';
 
 import styled from 'styled-components';
-import { grid } from '@pubsweet/ui-toolkit';
+import { grid, override } from '@pubsweet/ui-toolkit';
 import { WaxContext, MenuButton } from 'wax-prosemirror-core';
 import FindAndReplaceComponent from './FindAndReplaceComponent';
 
@@ -23,6 +23,7 @@ const DropWrapper = styled.div`
   margin-top: ${grid(1)};
   position: absolute;
   top: 32px;
+  ${override('Wax.FindReplaceWrapper')}
 `;
 
 const FindAndReplaceTool = ({ item }) => {
diff --git a/wax-prosemirror-services/src/TablesService/components/CreateTable.js b/wax-prosemirror-services/src/TablesService/components/CreateTable.js
index e3fccffe04cfa49282df34eca1a2c7030a974784..5144c65265c8fd2b6d4a10ee38245a758a55e6e1 100644
--- a/wax-prosemirror-services/src/TablesService/components/CreateTable.js
+++ b/wax-prosemirror-services/src/TablesService/components/CreateTable.js
@@ -6,7 +6,7 @@ import {
   MenuButton,
 } from 'wax-prosemirror-core';
 import styled from 'styled-components';
-import { grid } from '@pubsweet/ui-toolkit';
+import { grid, override } from '@pubsweet/ui-toolkit';
 import InsertTableTool from './InsertTableTool';
 
 const Wrapper = styled.div`
@@ -19,6 +19,8 @@ const DropWrapper = styled.div`
   background: white;
   margin-top: ${grid(1)};
   position: absolute;
+
+  ${override('Wax.CreateTableWrapper')}
 `;
 
 const CreateTable = ({ item }) => {