Rearrange markup for display purposes.
Accordion collapses properly.