Fixing more

Fixed shapes sometimes not moving, fixed edit menu not going to shape