Shortcode Parameters, template cleanup, product layout