Updated layout and content