Graph, UI fixes