More view refactoring: all tests pass