changed pages to use templet layout
Merge origin/master