Finish static pages including refactor