added flexible layouts