Improve view adapters