Remaining work on page templates