Style upgrade: part 2 (headings and labels)