Finish static-pages
Merge branch 'static-pages'