Split column and row numbering
Headers refactoring