diff --git a/awx/network_ui/static/network_ui/src/network.ui.controller.js b/awx/network_ui/static/network_ui/src/network.ui.controller.js
index 960c060c91..e3aeeb6ead 100644
--- a/awx/network_ui/static/network_ui/src/network.ui.controller.js
+++ b/awx/network_ui/static/network_ui/src/network.ui.controller.js
@@ -173,7 +173,6 @@ var NetworkUIController = function($scope, $document, $location, $window, $http)
   $scope.rack_toolbox_controller = new fsm.FSMController($scope, toolbox_fsm.Start, $scope.inventory_toolbox_controller);
   //Rack Toolbox Setup
   $scope.rack_toolbox = new models.ToolBox(0, 'Rack', 'rack', 10, 200, 150, $scope.graph.height - 200 - 100);
-  $scope.rack_toolbox.items.push(new models.Group(0, 'Rack3', 'rack', 0, 0, 200, 1000, 'false'));
   $scope.rack_toolbox.spacing = 200;
   $scope.rack_toolbox.enabled = false;
   $scope.rack_toolbox_controller.remove_on_drop = false;
@@ -189,7 +188,6 @@ var NetworkUIController = function($scope, $document, $location, $window, $http)
   $scope.site_toolbox_controller = new fsm.FSMController($scope, toolbox_fsm.Start, $scope.rack_toolbox_controller);
   //Site Toolbox Setup
   $scope.site_toolbox = new models.ToolBox(0, 'Sites', 'sites', 10, 200, 150, $scope.graph.height - 200 - 100);
-  $scope.site_toolbox.items.push(new models.Group(0, 'Site3', 'site', 0, 0, 1000, 1000, 'false'));
   $scope.site_toolbox.spacing = 200;
   $scope.site_toolbox.enabled = false;
   $scope.site_toolbox_controller.remove_on_drop = false;
@@ -623,6 +621,7 @@ var NetworkUIController = function($scope, $document, $location, $window, $http)
     $scope.all_buttons.extend($scope.layers);
 
     $scope.onTaskStatus = function(data) {
+        console.log(['onTaskStatus', data]);
         var i = 0;
         var j = 0;
         var found = false;
@@ -648,11 +647,18 @@ var NetworkUIController = function($scope, $document, $location, $window, $http)
                         }
                     }
                 }
+                if (data.status !== null) {
+                    $scope.devices[i].status = data.status === "pass";
+                }
+                if (data.working !== null) {
+                    $scope.devices[i].working = data.working;
+                }
             }
         }
     };
 
     $scope.onDeviceStatus = function(data) {
+        console.log(['onDeviceStatus', data]);
         var i = 0;
         for (i = 0; i < $scope.devices.length; i++) {
             if ($scope.devices[i].name === data.name) {
diff --git a/awx/network_ui/static/network_ui/src/site.fsm.js b/awx/network_ui/static/network_ui/src/site.fsm.js
index f178b72e3e..91e89f12b2 100644
--- a/awx/network_ui/static/network_ui/src/site.fsm.js
+++ b/awx/network_ui/static/network_ui/src/site.fsm.js
@@ -91,6 +91,7 @@ _Ready.prototype.onPasteSite = function (controller, msg_type, message) {
     var device_map = {};
     var inner_group = null;
     var c_messages = [];
+    var membership_old_new = null;
     scope.hide_groups = false;
 
     scope.pressedX = scope.mouseX;
@@ -218,9 +219,17 @@ _Ready.prototype.onPasteSite = function (controller, msg_type, message) {
                                                  inner_group.type));
     }
     for(i=0; i< group.groups.length; i++) {
-        group.groups[i].update_membership(scope.devices, scope.groups);
+        membership_old_new = group.groups[i].update_membership(scope.devices, scope.groups);
+        c_messages.push(new messages.GroupMembership(controller.scope.client_id,
+                                                     group.groups[i].id,
+                                                     membership_old_new[2]));
     }
 
+    membership_old_new = group.update_membership(scope.devices, scope.groups);
+    c_messages.push(new messages.GroupMembership(controller.scope.client_id,
+                                                 group.id,
+                                                 membership_old_new[2]));
+
     scope.send_control_message(new messages.MultipleMessage(controller.scope.client_id, c_messages));
 };
 
diff --git a/awx/network_ui/static/network_ui/widgets/group.html b/awx/network_ui/static/network_ui/widgets/group.html
index fb8bc2b296..f20ab83d6e 100644
--- a/awx/network_ui/static/network_ui/widgets/group.html
+++ b/awx/network_ui/static/network_ui/widgets/group.html
@@ -1,4 +1,5 @@
 <g ng-if="!hide_groups || item.type == 'site'">
+<g ng-if="current_scale < 5">
 <g ng-if="current_scale > 0.5 || item.type == 'site' || (item.type == 'rack' && current_scale > 0.1)" >
 
 <g ng-if="item.moving">
@@ -129,3 +130,4 @@
 </g>
 
 </g>
+</g>
diff --git a/awx/network_ui/static/network_ui/widgets/network_ui.html b/awx/network_ui/static/network_ui/widgets/network_ui.html
index 1a479e8c60..01220004a9 100644
--- a/awx/network_ui/static/network_ui/widgets/network_ui.html
+++ b/awx/network_ui/static/network_ui/widgets/network_ui.html
@@ -70,7 +70,6 @@
                     <g awx-net-default></g>
                </g> <!-- end default -->
                <g awx-net-status-light></g>
-               <g awx-net-task-status></g>
             </g> <!-- end devices -->
 
             </g>