Update improvements to charts.

Not perfect yet though, because charts are only watched while chart view is displayed.