Fixed tabs; updated shortcodes.