Fixed graph scrolling issue.
Tidied up graph container.
Fixed merge conflicts.
Aligned graph scrolling