improve entity and product ui