Add missing layout and section elements for layouting.