Final changes for static pages