Typography work
Merge branch 'develop' into master