added thumbnails, shuffled templates a bit