Improve column layout, fix issue where data went to the wrong column