added form and fieldset tags