Refactored view. #34