Fix heading, clean up element IDs