Some font changes etc.
Merge branch 'newjoel8'