Refactor Static pages