some post-merge consistency for docViewer, and cleanup around smartdocs for new layout