diff --git a/editors/editoria/src/config/config.js b/editors/editoria/src/config/config.js
index 96bdb592bd41434bc14e2e2eaa262e136d69ae7b..b6b0b6be8d057c85b27567e21fee24298b6ca555 100644
--- a/editors/editoria/src/config/config.js
+++ b/editors/editoria/src/config/config.js
@@ -62,6 +62,10 @@ const saveTags = tags => {
   // console.log(tags);
 };
 
+const updateTrackStatus = status => {
+  // console.log('status', status);
+};
+
 export default {
   MenuService: [
     {
@@ -109,7 +113,7 @@ export default {
   TitleService: { updateTitle },
   RulesService: [emDash, ellipsis],
   ShortCutsService: {},
-  EnableTrackChangeService: { enabled: false, toggle: true },
+  EnableTrackChangeService: { enabled: false, toggle: true, updateTrackStatus },
   AcceptTrackChangeService: {
     own: {
       accept: true,
diff --git a/wax-prosemirror-components/package.json b/wax-prosemirror-components/package.json
index 7cc02702310cb033ef1450bddd9735bd69b296c2..4d46af1847e480f63e9206e2df25efc15813f52d 100644
--- a/wax-prosemirror-components/package.json
+++ b/wax-prosemirror-components/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.30",
   "description": "Wax prosemirror UI components",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
   "files": [
     "dist"
   ],
diff --git a/wax-prosemirror-components/src/components/customtag/CustomTagInlineOverlayCompoment.js b/wax-prosemirror-components/src/components/customtag/CustomTagInlineOverlayCompoment.js
index 3b6b0c98e22f5564e0a71aa53831d9075059a669..7f293860a0d979ccd46f97167932cfaca8135717 100644
--- a/wax-prosemirror-components/src/components/customtag/CustomTagInlineOverlayCompoment.js
+++ b/wax-prosemirror-components/src/components/customtag/CustomTagInlineOverlayCompoment.js
@@ -69,8 +69,13 @@ const Flex = styled.div`
   display: flex;
   justify-content: space-between;
 `;
+const ItemActive = styled.div`
+  color: #006f19;
+  width: 90%;
+`;
 
-const ItemWrapper = styled.div`
+const Item = styled.div`
+  cursor: pointer;
   width: 100%;
 `;
 
@@ -180,6 +185,14 @@ const CustomTagInlineOverlayComponent = ({ mark, setPosition, position }) => {
     return tag.tagType === 'inline';
   });
 
+  const disabledStyles = {
+    cursor: 'default',
+    opacity: '0.4',
+    pointerEvents: 'none',
+  };
+
+  const styles = $from.pos === $to.pos ? disabledStyles : {};
+
   return isCustomTagInline === true ? (
     <Wrapper>
       <InlineHeader>Custom Inline</InlineHeader>
@@ -188,11 +201,14 @@ const CustomTagInlineOverlayComponent = ({ mark, setPosition, position }) => {
           <ListStyle key={uuidv4()}>
             <Flex>
               {mark && mark.attrs.tags.includes(item.label) ? (
-                <ItemWrapper>{item.label}</ItemWrapper>
+                <ItemActive>{item.label}</ItemActive>
               ) : (
-                <ItemWrapper onMouseDown={() => addToSelection(item.label)}>
+                <Item
+                  onMouseDown={() => addToSelection(item.label)}
+                  style={styles}
+                >
                   {item.label}
-                </ItemWrapper>
+                </Item>
               )}
 
               {mark &&
diff --git a/wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js b/wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js
index 5ac65f9e2830befd5f4668eafda1484251f3fe97..7d639b5e90c4c879d2b8688ac807770f8fc4937e 100644
--- a/wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js
+++ b/wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js
@@ -77,25 +77,27 @@ const dropDownOptions = [
 
 const EditingSuggesting = ({ view: { dispatch, state }, item }) => {
   const { app, activeView, view } = useContext(WaxContext);
-  const isDisabled = app.config.get('config.EnableTrackChangeService').toggle;
+  const enableService = app.config.get('config.EnableTrackChangeService');
+  const isDisabled = enableService.toggle;
 
   const isEditable = view.main.props.editable(editable => {
     return editable;
   });
 
   const enableDisableTrackChanges = () => {
-    app.config.get('config.EnableTrackChangeService').enabled = !app.config.get(
-      'config.EnableTrackChangeService',
-    ).enabled;
+    enableService.enabled = !enableService.enabled;
+    if (enableService.updateTrackStatus)
+      enableService.updateTrackStatus(enableService.enabled);
+
     setTimeout(() => {
       activeView.focus();
     }, 100);
   };
 
   const selectedOption = () => {
-    if (app.config.get('config.EnableTrackChangeService').enabled)
+    if (enableService.enabled) {
       return dropDownOptions[1];
-
+    }
     return dropDownOptions[0];
   };
 
diff --git a/wax-prosemirror-core/package.json b/wax-prosemirror-core/package.json
index b75e41b66938d4a5a889294b8d28aecf5c0e75cd..a24cafd744f092299207c30a7484217537673542 100644
--- a/wax-prosemirror-core/package.json
+++ b/wax-prosemirror-core/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.30",
   "description": "Wax prosemirror core",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
   "files": [
     "dist"
   ],
diff --git a/wax-prosemirror-plugins/package.json b/wax-prosemirror-plugins/package.json
index 449d80aa68045e710649f784d27518bd48a03d6f..f1e9e5afc62ebd16bbd0eb2aba02cbfb05b99144 100644
--- a/wax-prosemirror-plugins/package.json
+++ b/wax-prosemirror-plugins/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.30",
   "description": "Wax prosemirror plugins",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
   "files": [
     "dist"
   ],
diff --git a/wax-prosemirror-schema/package.json b/wax-prosemirror-schema/package.json
index 0efa3837880c961ea9993c8165ec8d9e02148067..b3a25ac2e5143631dba069cd30d5a1d04e6d1fbc 100644
--- a/wax-prosemirror-schema/package.json
+++ b/wax-prosemirror-schema/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.30",
   "description": "Wax prosemirror schema",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
   "files": [
     "dist"
   ],
diff --git a/wax-prosemirror-services/package.json b/wax-prosemirror-services/package.json
index 59707d754e6aa99c5c1837cd3d06d2ee934fe22b..fa47bb8b6075484bd19219d076cc8f9af96a1cbc 100644
--- a/wax-prosemirror-services/package.json
+++ b/wax-prosemirror-services/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.30",
   "description": "Wax prosemirror services",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
   "files": [
     "dist"
   ],
diff --git a/wax-prosemirror-utilities/package.json b/wax-prosemirror-utilities/package.json
index 17e0357d04ccff5d64e4558d713e9b3fa074d8f3..c3155805c8b2077296de697f7f26c548c5fb0edf 100644
--- a/wax-prosemirror-utilities/package.json
+++ b/wax-prosemirror-utilities/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.30",
   "description": "Wax prosemirror utilities",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
   "files": [
     "dist"
   ],