Refactored user views