Refactor user view 2