More work on static pages