Fix and refactor static pages