Refactored axis labels. Fixed axis update