Flex box changes, added default values