label and move inputs of user 'edit account' form as per client feedback