Added snap to 40 px grid
Fixed boundary issue