Refactor views.