issue#137 - template and other pages issues
Merge pull request #138 from kevin000/issue#137

issue#137 - template and other pages issues