Fixed triple friend bug

Wrapped friend list in an extra container