Support thumbnails
fixed merge conflicts
Support media thumbnails