Issue #2896280 by thejimbirch: Completes split of Columns libraries and adds conditional in default template