Header & transition tweaks