Add product validation, and tab stops