Fix graph view
UI tweaks