Friends popup fixes
COnflict fix