Improve preview UX