Rework friends list, now works correctly