Updated Product Shortcodes & Tables