Add columns
Modify demo for using columns mixin