Updated the graph, better layout