[IMP] Subproduct popup improvements