Improve preview action