Updated static pages handling