More refactoring and column resizing