Updated move, so guides draw the whole shape when moving parts of shape