Just minor improvements to the HeaderWidget.