add charts back in, temporary style
Merge branch 'develop'