Refactor static pages
Refactor static pages