Refactor static pages