Style overhaul part 1, markup tweaks, and label rephrasing