Refactor views to allow separate editing of User Contact info and Account info