Adds Guard and additional changes to static pages