code cleanup
fix missing column layout updates