fixing wrap
improved user-list