Catalog form UX improvements