Add some fancy chart toggle controls and make the data names nicer