update form and structure