Use the revised layout system