CRM-14653 - cleanup markup in new sections so accordions work and help i...

...s placed correctly.