Added images and map tracking to the thumbnail (preview) controller. Some code cleanup.