Added fix to move nodes when rectangles redrawn