Tweak how preview images are displayed
Merge branch 'develop'