revise some pages
Merge origin/master