Redid Graphs layout
Fixed parsing problem in Graphs