Rewrote shortcode to use Output Buffer instead of string concatination