Finish static pages, refactored