Revised layout classes