updated page tpl
Merge branch 'dev'