Refactor user index stuff
Refactor user index