[CHANGE] Modified some page templates
Merge pull request #704 from TheSerapher/issue-695

[CHANGE] Modified some page templates