Update static pages
Added layout changes and improved testing
Finish layout and routes