More work on the graph view controller