[IMP] Add subproduct template
[IMP] Subproduct popup minor improvements