#766: scrollview to display all content
#766 resolve a merge conflict, a minor fix