User views refactored