Refactor and improve view.