diff --git a/public/app/features/dashboard/row/row.html b/public/app/features/dashboard/row/row.html
index bdff7c8506e..a1b1e1a1ea9 100644
--- a/public/app/features/dashboard/row/row.html
+++ b/public/app/features/dashboard/row/row.html
@@ -1,9 +1,9 @@
-<div class="dash-row-handle-column" ng-show="ctrl.dashboard.editMode">
-	<div class="dash-row-move-handle">
-	</div>
-	<div class="dash-row-resize-handle">
-	</div>
-</div>
+<!-- <div class="dash&#45;row&#45;handle&#45;column" ng&#45;show="ctrl.dashboard.editMode"> -->
+<!-- 	<div class="dash&#45;row&#45;move&#45;handle"> -->
+<!-- 	</div> -->
+<!-- 	<div class="dash&#45;row&#45;resize&#45;handle"> -->
+<!-- 	</div> -->
+<!-- </div> -->
 
 <div class="dash-row-content">
 
@@ -12,7 +12,7 @@
       <input class="gf-form-input width-10" ng-model="ctrl.row.title"></input>
 
       <label class="btn gf-form-btn btn-inverse">
-        Row Options <i class="fa fa-caret-down"></i>
+        Options <i class="fa fa-caret-down"></i>
       </label>
 
       <label class="btn gf-form-btn btn-inverse">