Feature/thumbnail fix

Rebased on develop after develop/master unswitcheroo