Merge branch 'feature/typography_improvements' into develop