Make fonts and underlines a little more consistent