Better support for nested layouts