Fix missing fieldset, duplicate ID on page 24