Added flex box fixes