Cleaned up a bit. Added Thumbnails