Adding image grp columns, image shortcode clean-up