Improve header layout when cells are really tight