Further View refactoring.