formatting fine tuning
fix #1608 corner case if small header + button bar below + max combiner