Updated graph functionality to give expanded view