View refactored