Thumbnails improvements