self viewer enhancements