Update layouts to add in headings. Now functional tests will pass.