Updated ProductAndItemEditor