diff --git a/EduNetworkBuilder/ActionClass.cs b/EduNetworkBuilder/ActionClass.cs
index cdfc8f4..880b4ec 100644
--- a/EduNetworkBuilder/ActionClass.cs
+++ b/EduNetworkBuilder/ActionClass.cs
@@ -127,7 +127,11 @@ namespace EduNetworkBuilder
                 case NBAction.changedevice:
                     break;
                 case NBAction.changelocation:
-                    if (source != null) source.ChangeLocation(Location);
+                    if (source != null)
+                    {
+                        source.ChangeLocation(Location);
+                        source.UnHide(); //In case it was hidden
+                    }
                     break;
                 case NBAction.deletecomponent:
                     break;
diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs
index 180979e..beb43cc 100644
--- a/EduNetworkBuilder/NetworkBuilder.cs
+++ b/EduNetworkBuilder/NetworkBuilder.cs
@@ -1742,8 +1742,9 @@ namespace EduNetworkBuilder
                     {
                         if (!ItemClickedOn.IsLockedInLocation())
                         {
-                            ItemClickedOn.ChangeLocation(CenteredLocation);
-                            ItemClickedOn.UnHide(); //If it was hidden, unhide it
+                            //ItemClickedOn.ChangeLocation(CenteredLocation);
+                            //ItemClickedOn.UnHide(); //If it was hidden, unhide it
+                            NB.DoActionMoveDevice(ItemClickedOn.GetUniqueIdentifier, CenteredLocation);
                             UpdateLinks();
                             UpdateVisuals();
                         }