Fixed Shortcode Issues