Updating image markup and shortcode flow