Fixes to the RateView
Merge remote-tracking branch 'github/master'