Updated layout structure.