Accordion JS amendment.
Mark-up rearrangement.