Changed routes
Finish layout and routes