Views refactor.