More work moving static pages to templates