Updated layout structure