Fixed issues where contact info label covers patient id label and changed edit link from button to link - RA-145

Fixed issues where contact info label covers patient id label and changed edit link from button to link - RA-145