[Bug 867696] Refactor up KPIGraph and VoteGraph