Finish static pages with refactoring