Add and refactor static pages with dynamic content