Viewer enhancements

Travis didn't start the build on PR #272 so re-submitting.