Modified the header and section to accommodate multi-line titles

Change-Id: I3b1779156a0cdec76b2d68337086c496c03ea44a
Merge "Modified the header and section to accommodate multi-line titles"