Fixed add/remove of email/phone number, fixed indentation