Refactor user view