Tweak font sizes
Merge branch 'master' into staging