Initial work on wine rater page
Fix merge conflict