Fixing vendor branch

These two branches need to be merged, so we can have a cohesive experience for Item/Ingredient/Vendor.