revised layout structure