Improve view management