Refactored user page