added form in edit friend's panel
resolved merge conflicts