Fixes typography issues
Merge branch 'stub-styles'