Fixed edit button
Fixed edit button & Email
resolve merge
resolve merge