diff --git a/services/web/app/views/project/editor/review-panel.jade b/services/web/app/views/project/editor/review-panel.jade
index defe50b9d0..f50008271a 100644
--- a/services/web/app/views/project/editor/review-panel.jade
+++ b/services/web/app/views/project/editor/review-panel.jade
@@ -1,6 +1,6 @@
 #review-panel
 	.review-panel-toolbar
-		span.review-panel-toolbar-span(ng-click="reviewPanel.trackNewChanges = !reviewPanel.trackNewChanges;") Track Changes 
+		span.review-panel-toolbar-label(ng-click="reviewPanel.trackNewChanges = !reviewPanel.trackNewChanges;") Track Changes 
 		review-panel-toggle(ng-model="reviewPanel.trackNewChanges")
 
 	.rp-entry-list(
diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee
index 8087edcf37..0914e8adc8 100644
--- a/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee
+++ b/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee
@@ -381,7 +381,7 @@ define [
 			return AceShareJsCodec.aceRangeToShareJs(range, lines)
 
 		_aceChangeToShareJs: (delta) ->
-			lines = @editor.getSession().getDocument().getLines 0, range.rowf
+			lines = @editor.getSession().getDocument().getLines 0, delta.start.row
 			return AceShareJsCodec.aceChangeToShareJs(delta, lines)
 		
 		_shareJsOffsetToAcePosition: (offset) ->
diff --git a/services/web/public/stylesheets/app/editor/review-panel.less b/services/web/public/stylesheets/app/editor/review-panel.less
index c550ec784d..d4ff6e19da 100644
--- a/services/web/public/stylesheets/app/editor/review-panel.less
+++ b/services/web/public/stylesheets/app/editor/review-panel.less
@@ -97,7 +97,9 @@
 .review-panel-toolbar {
 	display: none;
 	.rp-size-expanded & {
-		display: block;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 	}
 	.rp-state-current-file & {
 		position: absolute;
@@ -106,14 +108,14 @@
 		right: 0;
 	}
 	height: @rp-toolbar-height;
-	padding: 6px;
 	border-bottom: 1px solid @rp-border-grey;
 	background-color: @rp-bg-dim-blue;
 	text-align: center;
 	z-index: 2;
 }
-	.review-panel-toolbar-span {
+	.review-panel-toolbar-label {
 		cursor: pointer;
+		margin-right: 5px;
 	}
 
 .rp-entry-list {
@@ -635,10 +637,9 @@
 				content: 'OFF';
 				position: absolute;
 				top: 0;
-				left: 50%;
-				font-size: .8em;
+				right: 1px;
+				font-size: .75em;
 				font-weight: normal;
-				text-align: center;
 				line-height: 215%;
 				color: #FFF;
 			}
@@ -655,7 +656,8 @@
 
 			&::after {
 				content: 'ON';
-				left: 0;
+				left: 1px;
+				right: auto;
 				color: #FFF;
 			}
 		}