Refactoring views
Refactoring views