ECOM-583 Fixes the CSS bugs

@dianakhuang @rlucioni Can you please take a look and I will merge into Will's branch?