bug fix and added wrapping on friends list