Fix wordings and add ribbon