Added "Add friend" and a fix