Updated column grid, minor bugfixes
merge conflicts fixed