Add columns now that we are using row wrappers.
Merge pull request #33 from sirkitree/q0rban-fix-columns

Margin is broken due to row wrappers