Updated with static pages