Reword and add messages.properties