Cleanup code that was commented out
Tweak InfoLabel
Revise and use Thumbnail everywhere