Updated static pages and routing
Added new parts