Tidy up columns logic
Merge pull request #12 from madebycomrades/pete/column-update

Tidy up columns logic