Improve preview window