Fixing shortcode display so it doesn't always show above text. Changed output to return instead of echo.