clean up and add graph view indicator