Fixed most of the issues and added thumbnails