Add legend & restructure graph