Adding screen shots to criterion finished events.
Various fixes to try to make the ui more solid.
Merge branch 'master' into release