Better support for large layouts