Fixed missing chart axis labels when charts were in tile tabs. Chart drawing...

Fixed missing chart axis labels when charts were in tile tabs.  Chart drawing code was incorrectly clearing the special annotations output for drawing by annotation code.  Also performed a little code cleanup.