This makes the code match what we show in the screenshots. This
broke when headerbars were changed to allow titles to extend into
the margin.