Improve formatting of graph