WIP
WIP on dynamic column header height
Merge