Refactor role name logic. Add staff list to users index