Added wrapping for axis values