Improved layout appearance, added thumbnails