Feature/preview improvement 169