Partial fix to flip animating the graph view
merging new stuff