Form HTML output updates - changing IDs to classes