Improvements to the screenshot viewer, issue #460.