Finish refactoring static pages