Bringing back thumbnails, fixing some issues