Update to allow toggling between charting tpyes