Fix minor issues on Category Axis.

- use intelligent wrapper.
- adjust alignment to rotation.
Why this change?  I am personally more of a fan of using a stable set of defined values and then adjust rather than redefining these values every single time