Simplify the structure of index page and article page.
Merge remote-tracking branch 'origin/master'