Template fixes and thumbnails