Adding template for charts (and making display more compact).
Fixing upstream Git dependency after pull-request merge.