Improve live view
Improve live view