Remove deprecated mapTo attribute.
Separate main heading from supplemntary content.