Updated with confirm password fix and edit link