View refactoring
View refactoring