Improve viewer