merge fixes + my-friends tab