Refactoring some views
Refactoring
Refactoring