diff --git a/app/components/SimpleEditor/elements/track_change/TrackChangeControlTool.js b/app/components/SimpleEditor/elements/track_change/TrackChangeControlTool.js
index d5b1d6cdee1dc99f294c20bd7ad15be67cf40bc7..a3ab7adfa9bf1b0a0eb93ba0ac0cb039c7e5fb26 100644
--- a/app/components/SimpleEditor/elements/track_change/TrackChangeControlTool.js
+++ b/app/components/SimpleEditor/elements/track_change/TrackChangeControlTool.js
@@ -1,6 +1,11 @@
 import { Tool } from 'substance'
 
 class TrackChangeControlTool extends Tool {
+
+  getClassNames () {
+    return 'sm-target-track-change-enable'
+  }
+
   renderButton ($$) {
     const el = super.renderButton($$)
 
diff --git a/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js b/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js
index 9bbba4442ce36b323a9540c787c4bdf75c4a5666..83f007296d978af289b9b561491a1e1f330f01d0 100644
--- a/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js
+++ b/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js
@@ -1,6 +1,10 @@
 import { Tool } from 'substance'
 
 class TrackChangeControlViewTool extends Tool {
+
+  getClassNames () {
+    return 'sm-target-track-change-toggle-view'
+  }
   renderButton ($$) {
     const el = super.renderButton($$)
     if (this.getViewMode()) el.addClass('track-changes-view-active')
@@ -15,8 +19,8 @@ class TrackChangeControlViewTool extends Tool {
 
   getViewMode () {
     const editor = this.context.editor
-
     const { trackChangesView } = editor.state
+
     return trackChangesView
   }
 }
diff --git a/app/components/SimpleEditor/elements/track_change/TrackChangesProvider.js b/app/components/SimpleEditor/elements/track_change/TrackChangesProvider.js
index 8e7ebe93a759fec60fd4751fd5211198f647c1e1..4406615c2b9d1a97bd1d2d783a4c9826fa22a826 100644
--- a/app/components/SimpleEditor/elements/track_change/TrackChangesProvider.js
+++ b/app/components/SimpleEditor/elements/track_change/TrackChangesProvider.js
@@ -660,7 +660,6 @@ class TrackChangesProvider extends TOCProvider {
 
   getAllExistingTrackAnnotations () {
     const editorSession = this.getEditorSession()
-    // const selectionState = documentSession.getSelectionState()
     const selectionState = editorSession.getSelectionState()
     const annotations = selectionState.getAnnotationsForType('track-change')
     return annotations
@@ -762,7 +761,7 @@ class TrackChangesProvider extends TOCProvider {
     // const lastChange = last(undoneChanges)
     // const op = last(lastChange.ops)
     //
-    // const isTrack = op.path[0].split('-').slice(0, -1).join('-') === 'track-change'
+    // const isTrack = op.path[0].split('-').slice(0, -1).join('-') === 'track-change
   }
 
   /*