SPC-844 & 842, fix issue with dragging in manual layout