More view refactoring