Partial tweaks due to font change.