Add scroll for doc-view mode, and minor edits
Merge with remote