Fix minor issues on Category Axis.

- use intelligent wrapper.
- adjust alignment to rotation.
Retracted