Refactor users views