Updating product tabs

Folding in product tab code from 201304 per JT