Reworking stuff for header UX.