eCommerce enhancements

@chrisndodge I will update all the changes that @dianakhuang has mentioned in the upcoming PR.
Thanks