Combine header pinning with height recalc