Added graph view and UI changes