Fix headlines and headers