Improve static pages