Fix rating dialog
Merge commit 'a716a08617226dbd95c4ef043182e443d6f0eac0' into develop
Tweak here and there
Merge commit '10cc3403101ee0389b2b75312b24e22d84419d00' into develop