Refactored static pages