Updated controllers, return thumbnails