improved product entity forms