Flex box improvements