Improve view