Fixed the edit contact button to be to the right of the contact.
Resolved merge conflicts.