Update routes
Finish layout and routes