Refactor user views