Added Click to scroll
other minor changes