Updated flex and fixed width support