add font
fix styles
Merge branch 'master' into development