Fix the font family.
Fix the font-sizing.
Merge branch 'develop'