Switch header order