Improvings for static pages