Thumbnail rework