Added label and glyphicon shortcodes