Tweak styling of text; move some styling into css classes