Refactored users views