add views refactoring