users page fixes/refactoring