Fix graph data (not ready)

Fixes some issues reach is having with legend rendering.