Lots of column shortcode edits