View refactoring