Better support for flexible layouts