Fixing charts to use new version of google charts
trying to make it more flexible to further changes.