code cleanup in Friends list overlay
Merge remote-tracking branch 'origin/master'