Added flexible layouts