fix linkages, include section intros, and use single layout