Refactor views
Refactor views