Merged with Micheal's code for AxisLabels