Added cell snapping