Revised 'tab'and 'accordion' shortcode