Improve Product screen field organization, Product Option behavior