More page.tpl cleanup