Feature/thumbnail refactor