Improve live view