update static pages
update dry code
Finish layout and routes