Began fixing DocumentViewer