Viewer enhancements