Started fixing issues with lock axis checkboxes (work in progress)