Changed shortcode to return instead of echo