Change xlsform to reflect new changes