Refactored how thumbnails are displayed
All tests passing