Change some texts according to the task #1009. Fix some style issue.