Finish static pages
Finish layout and routes
update
Merge branch 'static-pages'