Enhancements to thumbnails layout