This is more correct, simpler, fixes a few small visual glitches and preserves the right header height.