Modified scroll bar on left to match mockup.
Fixed merge conflict.