Major refactoring and started more work on resizing columns