diff --git a/src/Umbraco.Web.UI.Client/src/less/gridview.less b/src/Umbraco.Web.UI.Client/src/less/gridview.less
index ed82b4896e..a64af94915 100644
--- a/src/Umbraco.Web.UI.Client/src/less/gridview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/gridview.less
@@ -7,7 +7,7 @@
  // Sortabel
  // -------------------------
  .usky-grid .ui-sortable-helper  {
-     border: dashed 1px #$000;
+     border: dashed 1px #000;
      background: #ccc;
      opacity: 0.4;
      height: 50px !important;
@@ -205,9 +205,9 @@
 // CONTROL
 // -------------------------
 .usky-grid .usky-control {
-    transition: all .20s ease-in-out;
+    /*transition: all .20s ease-in-out;
     -moz-transition: all .20s ease-in-out;
-    -webkit-transition: all .20s ease-in-out;
+    -webkit-transition: all .20s ease-in-out;*/
     position:relative;
     display:block;
     
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 827dfbc99d..15a85a0d7c 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
@@ -19,37 +19,133 @@ angular.module("umbraco")
             cursor: "move",
             placeholder: 'ui-sortable-placeholder',
             handle: '.cell-tools-move',
+
             start: function (e, ui) {
                 ui.item.find('.mceNoEditor').each(function () {
                     tinyMCE.execCommand('mceRemoveEditor', false, $(this).attr('id'));
 
                 });
             },
+
             stop: function (e, ui) {
                 ui.item.find('.mceNoEditor').each(function () {
                     tinyMCE.execCommand('mceAddEditor', false, $(this).attr('id'));
                 });
             }
+
         };
 
+        var includedRte = [];
+        var allowedEditors = [];
+        var currentEditor = "";
+
         $scope.sortableOptionsCell = {
+
             distance: 10,
             cursor: "move",
             placeholder: "ui-sortable-placeholder",
             handle: '.cell-tools-move',
             connectWith: ".usky-cell",
+            forcePlaceholderSize: true,
+
+            receive: function (event, ui) {
+
+                ui.sender.sortable("cancel");
+
+                $scope.$apply();
+
+                //if ($(this).scope().area)
+                //{
+                //    var allowedEditors = $(this).scope().area.allowed;
+                //}
+
+                //if (ui.item.scope().control) {
+                //    var currentEditor = ui.item.scope().control.editor.alias;
+                //}
+
+            },
+
+            update: function (event, ui) {
+
+                //ui.sender.sortable("cancel");
+
+                //$scope.$apply();
+
+                //if ($.inArray(currentEditor, allowedEditors) < 0) {
+
+                //    var notIncludedRte = [];
+                //    ui.item.find('.mceNoEditor').each(function () {
+                //        notIncludedRte.splice(0, 0, $(this).attr('id'));
+                //    });
+
+                //    if (ui.sender) {
+                //        ui.item.parents(".usky-cell").find('.mceNoEditor').each(function () {
+                //            if ($.inArray($(this).attr('id'), notIncludedRte) < 0) {
+                //                tinyMCE.execCommand('mceRemoveEditor', false, $(this).attr('id'));
+                //                includedRte.splice(0, 0, $(this).attr('id'));
+                //            }
+                //        });
+                //    }
+
+                //    ui.item.sortable.cancel();
+
+
+
+
+                //}
+                //else {
+
+                if (ui.sender) {
+                    var notIncludedRte = [];
+                    ui.item.find('.mceNoEditor').each(function () {
+                        notIncludedRte.splice(0, 0, $(this).attr('id'));
+                    });
+
+                    
+                        ui.item.parents(".usky-cell").find('.mceNoEditor').each(function () {
+                            if ($.inArray($(this).attr('id'), notIncludedRte) < 0) {
+                                tinyMCE.execCommand('mceRemoveEditor', false, $(this).attr('id'));
+                                includedRte.splice(0, 0, $(this).attr('id'));
+                            }
+                        });
+                    
+
+                    ui.item.find('.mceNoEditor').each(function () {
+                        tinyMCE.execCommand('mceAddEditor', false, $(this).attr('id'));
+                    });
+
+    }
+                //}
+
+
+
+
+
+
+
+            },
+
             start: function (e, ui) {
                 ui.item.find('.mceNoEditor').each(function () {
-                    tinyMCE.execCommand('mceRemoveEditor', false, $(this).attr('id'));
-
+                    tinyMCE.execCommand('mceRemoveEditor', false, $(this).attr('id'))
                 });
             },
+
             stop: function (e, ui) {
+
+                $scope.$apply();
+
                 ui.item.find('.mceNoEditor').each(function () {
                     tinyMCE.execCommand('mceAddEditor', false, $(this).attr('id'));
                 });
+
+                _.forEach(includedRte, function (value, index) {
+                    tinyMCE.execCommand('mceAddEditor', false, value);
+                });
+
             }
-        };
+        }
+
 
         // *********************************************
         // Template management functions
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 5ab4c07794..bcb89a51e2 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
@@ -36,8 +36,7 @@
                  ng-init="initSection(section)"
                  style="width:{{section.$percentage}}%">
 
-                <!--<div ui-sortable="sortableOptionsTest" ng-model="section.rows">-->
-                <div ng-model="section.rows">
+                <div ui-sortable="sortableOptions" ng-model="section.rows">
 
                     <!-- for each row in template section -->
                     <div ng-repeat="row in section.rows"
@@ -55,7 +54,7 @@
                                 <div class="iconBox"
                                      ng-click="deletePrompt = true"
                                      ng-mouseover="setCurrentRemoveControl(row)"
-                                     ng-mouseleave="disableCurrentRemoveControl(row)">  
+                                     ng-mouseleave="disableCurrentRemoveControl(row)">
 
                                     <span ng-if="deletePrompt">
                                         Are you sure?