Graph UI fixes