Change column size
Merge branch 'develop'