Refactor of static pages