Tweaks to how headers are being shown.