Fix issue with multiple sections with layout