refactored view files