Assorted header display fixes