View refactoring.