Finish static pages
Merge branch 'static_pages'