Snapping design improvements