Finish work on static pages branch