Refactored ratings
Merge branch 'develop' into master
Typography work