Added graph and various improvements to the UI