refactored columns

Used mixin more efficiently
Fixed bug with rows
Merge pull request #1 from Brobin/develop

Merge Develop to master