Add custom section header/footers along with other updates