Changed fieldset and added main tag