Finish static pages
Typo fixed
Merge branch 'static-pages'