Columns

Fixed problem with column gaps
Proper tests