Static pages refactor