handling thumbnails better