Minor tweaks to cart shortcode