Better header text handling