Fixed thumbnail bboxes and broke up thumbnail delegate into more bitesize functions