diff --git a/src/Umbraco.Web.UI.Client/src/less/gridview.less b/src/Umbraco.Web.UI.Client/src/less/gridview.less
index 1367faf3c7..16d49939d4 100644
--- a/src/Umbraco.Web.UI.Client/src/less/gridview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/gridview.less
@@ -186,7 +186,7 @@
 .usky-grid  .cell-tools-move {
     display:inline-block;
     position: absolute;
-    top: 40px;
+    top: 33px;
     right: 5px;
     z-index: 500;
     cursor: move
@@ -194,7 +194,7 @@
 
 .usky-grid .cell-tools-edit{
     position: absolute;
-    top: 80px;
+    top: 66px;
     right: 5px;
 }
 
@@ -229,11 +229,11 @@
     /*border-bottom:1px solid rgba(182, 182, 182, 0.0) !important;*/
 }
 
-.usky-grid .warnhighlight{
+.usky-grid .warnhighlight, .usky-grid  .td.last.warnhighlight{
      border: 1px dashed @red !important;
 }
 
-.usky-grid .infohighlight{
+.usky-grid .infohighlight, .usky-grid  .td.last.infohighlight{
      border: 1px dashed @blue !important;
 }
 
@@ -327,7 +327,7 @@
 // ICONS
 // -------------------------
  .usky-grid  .iconBox {
-     padding: 4px 7px 4px 7px;
+     padding: 4px 6px 4px 6px;
      display: inline-block;
      cursor: pointer;
      border-radius: 200px;
@@ -339,6 +339,7 @@
           background: @blue !important;
           color: white !important;
           border-color: @blue !important;
+          text-decoration:none;
  }
 
  .usky-grid  .iconBox a:hover {
@@ -370,12 +371,10 @@
  .usky-grid  .iconBox i {
      font-size:16px !important;
      color: #5F5F5F;
+     display:block;
  }
 
 
-
-
-
  .usky-grid  ul {
      display:inline-block;
      list-style:none;
@@ -482,19 +481,16 @@
     padding-bottom: 20px;
  }
 
- .usky-grid .usky-row{
-
- }
-
  .usky-grid .usky-control{
      margin: 10px 0 0 0;
      padding: 5px;
+     border: 1px dashed transparent;
  }
 
  .usky-grid .usky-templates-columns{
      margin-top: 30px;
  }
-
+    
  .usky-grid .usky-row-inner{
     margin-right: 45px;
     border: 1px dashed transparent;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
index ec47771491..05682dce29 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
@@ -184,20 +184,20 @@ angular.module("umbraco")
             $scope.currentRow = null;
         };
 
-        $scope.setCurrentRemoveRow = function (Row) {
-            $scope.currentRemoveRow = Row;
+        $scope.setWarnighlightRow = function (row) {
+            $scope.currentWarnhighlightRow = row;
         };
 
-        $scope.disableCurrentRemoveRow = function (Row) {
-            $scope.currentRemoveRow = null;
+        $scope.disableWarnhighlightRow = function () {
+            $scope.currentWarnhighlightRow = null;
         };
 
-        $scope.setCurrentMovedRow = function (Row) {
-            $scope.currentMovedRow = Row;
+        $scope.setInfohighlightRow = function (row) {
+            $scope.currentInfohighlightRow = row;
         };
 
-        $scope.disableCurrentMovedRow = function (Row) {
-            $scope.currentMovedRow = null;
+        $scope.disableInfohighlightRow = function () {
+            $scope.currentInfohighlightRow = null;
         };
 
         $scope.getAllowedLayouts = function(column){
@@ -252,14 +252,14 @@ angular.module("umbraco")
         };
 
         // *********************************************
-        // Cell management functions
+        // Area management functions
         // *********************************************
 
         $scope.setCurrentCell = function (cell) {
             $scope.currentCell = cell;
         };
 
-        $scope.disableCurrentCell = function (cell) {
+        $scope.disableCurrentCell = function () {
             $scope.currentCell = null;
         };
 
@@ -272,7 +272,13 @@ angular.module("umbraco")
             }
         };
 
+        $scope.setInfohighlightArea = function (cell) {
+            $scope.currentInfohighlightArea = cell;
+        };
 
+        $scope.disableInfohighlightArea = function () {
+            $scope.currentInfohighlightArea = null;
+        };
 
 
         // *********************************************
@@ -294,22 +300,20 @@ angular.module("umbraco")
             $scope.currentToolsControl = null;
         };
 
-        $scope.setCurrentRemoveControl = function (Control) {
-            $scope.currentRemoveControl = Control;
+        $scope.setWarnhighlightControl = function (Control) {
+            $scope.currentWarnhighlightControl = Control;
         };
 
-        $scope.disableCurrentRemoveControl = function (Control) {
-            $scope.currentRemoveControl = null;
+        $scope.disableWarnhighlightControl = function (Control) {
+            $scope.currentWarnhighlightControl = null;
         };
 
-        $scope.setCurrentMovedControl = function (Control) {
-            $scope.currentRow = null;
-            $scope.currentRemoveControl = null;
-            $scope.currentMovedControl = Control;
+        $scope.setInfohighlightControl = function (Control) {
+            $scope.currentInfohighlightControl = Control;
         };
 
-        $scope.disableCurrentMovedControl = function (Control) {
-            $scope.currentMovedControl = null;
+        $scope.disableInfohighlightControl = function (Control) {
+            $scope.currentInfohighlightControl = null;
         };
 
         $scope.setUniqueId = function (cell, index) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index e8ce3f9316..7ecf2d4cbb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -65,8 +65,8 @@
                             <div class="cell-tools-remove">
                                 <div class="iconBox"
                                      ng-click="deletePrompt = true"
-                                     ng-mouseenter="setCurrentRemoveControl(row)"
-                                     ng-mouseleave="disableCurrentRemoveControl(row)">
+                                     ng-mouseover="setWarnighlightRow(row)"
+                                     ng-mouseleave="disableWarnhighlightRow(row)">
 
                                     <span ng-if="deletePrompt">
                                         Are you sure?
@@ -79,13 +79,19 @@
 
                             <div class="cell-tools-move">
                                 <a class="iconBox"
-                                    href>
+                                   ng-mouseover="setInfohighlightRow(row)"
+                                   ng-mouseleave="disableInfohighlightRow(row)"
+                                   href>
                                     <i class="icon icon-navigation"></i>
                                 </a>
                             </div>
 
                             <div class="cell-tools-edit" ng-if="hasSettings">
-                                <a href class="iconBox" ng-click="editGridItemSettings(row)">
+                                <a class="iconBox"
+                                   ng-mouseover="setInfohighlightRow(row)"
+                                   ng-mouseleave="disableInfohighlightRow(row)"
+                                   ng-click="editGridItemSettings(row)"
+                                   href>
                                     <i class="icon icon-settings"></i>
                                 </a>
                             </div>
@@ -94,19 +100,20 @@
 
                         <!-- row container -->
                         <div class="{{row.cssClass}} mainContainer usky-row-inner"
-                             ng-class="{last:$last,first:$first,warnhighlight:currentRemoveRow == row, infohighlight:currentMovedRow == row}">
+                             ng-class="{last:$last,first:$first,warnhighlight:currentWarnhighlightRow == row, infohighlight:currentInfohighlightRow == row}">
 
                             <div class="mainTb">
                                 <div class="tb">
                                     <div class="tr">
 
-                                        <!-- cells in row -->
+                                        <!-- Areas in row -->
                                         <div ng-style="{width: area.$percentage + '%'}"
-                                             ng-class="{last:$last,first:$first}"
                                              class="td mainTd usky-cell"
+                                             ng-class="{last:$last,first:$first, infohighlight:currentInfohighlightArea == area,
+                                                            warnhighlight:currentWarnhighlightArea == area}"
                                              ng-repeat="area in row.areas" ui-sortable="sortableOptionsCell" ng-model="area.controls">
 
-                                            <!-- Controls in cell -->
+                                            <!-- Controls in areas -->
                                             <div ng-repeat="control in area.controls"
                                                  ng-mouseover="setCurrentControl(control)"
                                                  ng-mouseleave="disableCurrentControl(control)"
@@ -118,12 +125,12 @@
                                                      ng-animate="'fade'"
                                                      ng-show="control && (currentControl == control)">
 
-                                                    <!-- delete cell -->
+                                                    <!-- delete control -->
                                                     <div class="cell-tools-remove">
                                                         <div class="iconBox"
                                                              ng-click="deletePrompt = true"
-                                                             ng-mouseover="setCurrentRemoveControl(control)"
-                                                             ng-mouseleave="disableCurrentRemoveControl(control)">
+                                                             ng-mouseover="setWarnhighlightControl(control)"
+                                                             ng-mouseleave="disableWarnhighlightControl(control)">
 
                                                             <span ng-show="deletePrompt">
                                                                 Are you sure?
@@ -134,25 +141,32 @@
                                                         </div>
                                                     </div>
 
-                                                    <!-- move cell -->
+                                                    <!-- move control -->
                                                     <div class="cell-tools-move">
-                                                        <div class="iconBox"
-                                                             ng-mouseover="setCurrentMovedControl(control)"
-                                                             ng-mouseleave="disableCurrentMovedControl(control)">
+                                                        <a class="iconBox"
+                                                           ng-mouseover="setInfohighlightControl(control)"
+                                                           ng-mouseleave="disableInfohighlightControl(control)"
+                                                           href>
                                                             <i class="icon icon-navigation"></i>
-                                                        </div>
+                                                        </a>
                                                     </div>
 
+                                                    <!-- setting area -->
                                                     <div class="cell-tools-edit" ng-if="hasSettings && $first">
-                                                        <a href class="iconBox" ng-click="editGridItemSettings(area)">
+                                                        <a class="iconBox"
+                                                           ng-mouseover="setInfohighlightArea(area)"
+                                                           ng-mouseleave="disableInfohighlightArea(area)"
+                                                           ng-click="editGridItemSettings(area)"
+                                                           href>
                                                             <i class="icon icon-settings"></i>
                                                         </a>
                                                     </div>
+
                                                 </div>
 
                                                 <div class="usky-control-inner" ng-class="{last:$last,
-                                                               infohighlight:currentMovedControl == control,
-                                                               warnhighlight:currentRemoveControl == control,
+                                                               infohighlight:currentInfohighlightControl == control,
+                                                               warnhighlight:currentWarnhighlightControl == control,
                                                                selectedControl:currentControl == control}">
                                                     <!-- Redering the editor for specific control -->
                                                     <div ng-if="control && control.$editorPath"
@@ -162,29 +176,26 @@
                                                 </div>
                                             </div>
                                             <!-- Controls repeat end -->
-                                                
                                             <!-- if area is empty tools -->
                                             <div class="usky-control usky-control-placeholder"
                                                  ng-if="area.controls.length == 0">
-                                                    <div class="help-text" style="margin-bottom: 15px">
-                                                        To start, click the <i class=" icon icon-add blue">
-                                                        </i> below and add your first element
-                                                    </div><br />
-                                            </div> 
+                                                <div class="help-text" style="margin-bottom: 15px">
+                                                    To start, click the <i class=" icon icon-add blue">
+                                                    </i> below and add your first element
+                                                </div><br />
+                                            </div>
 
                                             <div class="cell-tools-add"
                                                  ng-if="!currentToolsControl"
                                                  ng-animate="'fade'">
 
-                                                <div class="iconBox">
-                                                    <a href ng-click="addItemOverlay($event, area, 0, area.$uniqueId);">
-                                                        <i class=" icon icon-add"></i>
-                                                    </a>
-                                                </div>
-
+                                                <a class="iconBox" href ng-click="addItemOverlay($event, area, 0, area.$uniqueId);">
+                                                    <i class=" icon icon-add"></i>
+                                                </a>
+                                                
                                                 <div ng-if="overlayMenu.show && overlayMenu.key == area.$uniqueId" ng-include="'views/propertyeditors/grid/dialogs/additem.html'"></div>
                                             </div>
-                                                
+
                                         </div>
                                         <!-- cells repeat end -->
                                     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
index 7df7e9fded..b2c57b4737 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
@@ -2,7 +2,8 @@
     <input type="text" name="textbox" ng-model="model.value" id="{{model.alias}}"
            class="umb-editor umb-textstring textstring"
            val-server="value"
-           ng-required="model.validation.mandatory" />
+           ng-required="model.validation.mandatory"
+           ng-trim="false" />
 
     <span class="help-inline" val-msg-for="textbox" val-toggle-msg="required">Required</span>
     <span class="help-inline" val-msg-for="textbox" val-toggle-msg="valServer"></span>