Refactor user pages