update for static pages
Merge branch 'work'