More view refactoring.