Shortcode, style and helper tweaks.