Refactored product schema and UI