Switched to asynchronous display of graphs, and also simplified some display logic