Simplified the graph view a lot