views refactored