Preview mode fix and thumb