Implemented lock to axis and snapping features