Shortcode HTML output updates. Trying out simple version form again