Improvement on graphs and gauges.

Jira issue: HUBHAC-9